Merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module

[Chris Hillery]

-Replaced open functions with old ones to make it work with Macports

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100380-2013-01-16T22-22-25.468Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1100380-2013-01-16T22-22-25.468Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending.

[Cezar Andrei (cezar-andrei)]

Works fine with Macports now.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100380-2013-01-17T00-36-42.21Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1100380-2013-01-17T00-36-42.21Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve.

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100380-2013-01-17T11-08-42.647Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug1100380-2013-01-17T11-08-42.647Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100380-2013-01-17T11-38-40.881Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1100380-2013-01-17T11-38-40.881Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp	2012-09-18 21:44:28 +0000
+++ src/archive_module.xq.src/archive_module.cpp	2013-01-16 22:18:22 +0000
@@ -919,15 +919,7 @@
         base64::attach(*theData.theStream);
       }
 
-	    lErr = archive_read_set_read_callback(
-        theArchive, ArchiveItemSequence::readStream);
-      ArchiveFunction::checkForError(lErr, 0, theArchive);
-
-      lErr = archive_read_set_callback_data(
-        theArchive, &theData);
-      ArchiveFunction::checkForError(lErr, 0, theArchive);
-
-      lErr = archive_read_open1(theArchive);
+      lErr = archive_read_open(theArchive, &theData, NULL, ArchiveItemSequence::readStream, NULL);
       ArchiveFunction::checkForError(lErr, 0, theArchive);
     }
     else
@@ -1515,7 +1507,6 @@
     //updated with the new Files specified
     ArchiveCompressor lResArchive;
     ArchiveOptions lOptions;
-    bool lHasItem = false;
 
     Item lItem;
     Iterator_t lSeqIter = lSeq->getIterator();
@@ -1523,13 +1514,12 @@
     //read first header and file of the archive so we can get the options before creating 
     //the new archive.
     lSeqIter->open();
-    lHasItem = lSeqIter->next(lItem);
+    lSeqIter->next(lItem);
     //set the options of the archive
     lOptions = lSeq->getOptions();
     //create new archive with the options read
     lResArchive.open(lOptions);
-    //if (!lItem.isNull())
-    if (lHasItem)
+    if (!lItem.isNull())
     {
       do 
       {