Mercurial > libpst

comparison src/pst2dii.cpp.in @ 79:56fa05fd5271

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Patch from Robert Simpson for encryption type 2. Fix the order of testing item types to avoid claiming there are multiple message stores.
author Carl Byington <carl@five-ten-sg.com>
date Fri, 13 Jun 2008 20:47:01 -0700
parents 3cb02cb1e6cd
children 7133b39975f7
comparison
equal deleted inserted replaced
78:535075b4d261 79:56fa05fd5271
618 while (d_ptr) { 618 while (d_ptr) {
619 if (d_ptr->desc) { 619 if (d_ptr->desc) {
620 item = pst_parse_item(&pstfile, d_ptr); 620 item = pst_parse_item(&pstfile, d_ptr);
621 DEBUG_INFO(("item pointer is %p\n", item)); 621 DEBUG_INFO(("item pointer is %p\n", item));
622 if (item) { 622 if (item) {
623 if (item->message_store) {
624 // there should only be one message_store, and we have already done it
625 DIE(("main: A second message_store has been found. Sorry, this must be an error.\n"));
626 }
627
628 if (item->folder && d_ptr->child ) { 623 if (item->folder && d_ptr->child ) {
629 //if this is a non-empty folder, we want to recurse into it 624 //if this is a non-empty folder, we want to recurse into it
630 fprintf(stderr, "entering folder %s\n", item->file_as); 625 fprintf(stderr, "entering folder %s\n", item->file_as);
631 process(item, &ff, d_ptr->child); 626 process(item, &ff, d_ptr->child);
632 } else if (item->email && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) { 627 } else if (item->email && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) {
634 DEBUG_MAIN(("main: Processing Email\n")); 629 DEBUG_MAIN(("main: Processing Email\n"));
635 if ((ff.type != PST_TYPE_NOTE) && (ff.type != PST_TYPE_REPORT)) { 630 if ((ff.type != PST_TYPE_NOTE) && (ff.type != PST_TYPE_REPORT)) {
636 DEBUG_MAIN(("main: I have an email, but the folder isn't an email folder. Processing anyway\n")); 631 DEBUG_MAIN(("main: I have an email, but the folder isn't an email folder. Processing anyway\n"));
637 } 632 }
638 write_normal_email(ff, item, &pstfile); 633 write_normal_email(ff, item, &pstfile);
639 } 634 }
640 pst_freeItem(item); 635 pst_freeItem(item);
641 } else { 636 } else {
642 ff.skip_count++; 637 ff.skip_count++;
643 DEBUG_MAIN(("main: A NULL item was seen\n")); 638 DEBUG_MAIN(("main: A NULL item was seen\n"));
644 } 639 }