[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
Validation queue job zorba-with-file-access-2013-01-24T03-57-38.04Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-with-file-access-2013-01-24T03-57-38.04Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
Validation queue job zorba-with-file-access-2013-01-24T02-57-12.945Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-with-file-access-2013-01-24T02-57-12.945Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba has been updated. Commit Message changed to: Fixes to make ZORBA_WITH_FILE_ACCESS=0 work. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba
Chris Hillery has proposed merging
lp:~zorba-coders/zorba/zorba-with-file-access into lp:zorba.
Commit message:
Fixes to make ZORBA_WITH_FILE_ACCESS=0 work.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-with-file-access/+merge/144622
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2012-11-06 10:11:37 +
+++ bin/zorbacmd.cpp 2013-01-24 02:29:23 +
@@ -622,6 +622,7 @@
void
removeOutputFileIfNeeded(const ZorbaCMDProperties& lProperties)
{
+#ifdef ZORBA_WITH_FILE_ACCESS
if (lProperties.outputFile().size() > 0)
{
File_t lFile = zorba::File::createFile(lProperties.outputFile());
@@ -630,6 +631,7 @@
lFile->remove();
}
}
+#endif /* ZORBA_WITH_FILE_ACCESS */
}
@@ -963,20 +965,28 @@
// write to file or standard out
std::auto_ptr
- lFileStream(properties.outputFile().size() > 0 ?
- new std::ofstream(properties.outputFile().c_str()) : 0);
+ lFileStream(
+ #ifdef ZORBA_WITH_FILE_ACCESS
+properties.outputFile().size() > 0 ?
+ new std::ofstream(properties.outputFile().c_str()) : 0
+ #else /* ZORBA_WITH_FILE_ACCESS */
+0
+ #endif /* ZORBA_WITH_FILE_ACCESS */
+);
std::ostream* lOutputStream = lFileStream.get();
if ( lOutputStream == 0 )
{
lOutputStream = &std::cout;
}
+#ifdef ZORBA_WITH_FILE_ACCESS
else if ( !lOutputStream->good() )
{
std::cerr << "could not write to output file {" << properties.outputFile()
<< "}" << std::endl;
return 2;
}
+#endif /* ZORBA_WITH_FILE_ACCESS */
if (properties.queriesOrFilesBegin() == properties.queriesOrFilesEnd())
{
=== modified file 'bin/zorbacmdproperties_base.h'
--- bin/zorbacmdproperties_base.h 2012-11-06 10:11:37 +
+++ bin/zorbacmdproperties_base.h 2013-01-24 02:29:23 +
@@ -32,7 +32,11 @@
const char** get_all_options () const
{
static const char* result [] = {
- "--timing", "--output-file", "--serialization-parameter",
+ "--timing",
+#ifdef ZORBA_WITH_FILE_ACCESS
+ "--output-file",
+#endif /* ZORBA_WITH_FILE_ACCESS */
+ "--serialization-parameter",
"--serialize-html", "--serialize-text", "--indent", "--print-query",
"--print-errors-as-xml", "--byte-order-mark", "--omit-xml-declaration",
"--base-uri", "--boundary-space", "--default-collation",
@@ -48,7 +52,9 @@
}
bool theTiming;
+#ifdef ZORBA_WITH_FILE_ACCESS
std::string theOutputFile;
+#endif /* ZORBA_WITH_FILE_ACCESS */
std::vector theSerializationParameter;
bool theSerializeHtml;
bool theSerializeText;
@@ -119,7 +125,9 @@
public:
const bool &timing () const { return theTiming; }
+#ifdef ZORBA_WITH_FILE_ACCESS
const std::string &outputFile () const { return theOutputFile; }
+#endif /* ZORBA_WITH_FILE_ACCESS */
const std::vector &serializationParameter () const { return theSerializationParameter; }
const bool &serializeHtml () const { return theSerializeHtml; }
const bool &serializeText () const { return theSerializeText; }
@@ -177,6 +185,7 @@
{
theTiming = true;
}
+#ifdef ZORBA_WITH_FILE_ACCESS
else if (strcmp (*argv, "--output-file") == 0 || strncmp (*argv, "-o", 2) == 0)
{
int d = 2;
@@ -184,6 +193,7 @@
if (*argv == NULL) { result = "No value given for --output-file option"; break; }
init_val (*argv, theOutputFile, d);
}
+#endif /* ZORBA_WITH_FILE_ACCESS */
else if (strcmp (*argv, "--serialization-parameter") == 0 || strncmp (*argv, "-z", 2) == 0)
{
int d = 2;
=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt 2012-12-05 03:33:46 +
+++ src/api/CMakeLists.txt 2013-01-24 02:29:23 +
@@ -46,7 +46,6 @@
invoke_item_sequence.cpp
item_sequence_chainer.cpp
empty_sequence.cpp
-fileimpl.cpp
serializerimpl.cpp
base64impl.cpp
base64_streambuf.cpp
@@ -63,6 +62,11 @@
uuid.cpp
)
+IF (ZORBA_WITH_FILE_ACCESS)
+ LIST(APPEND API_SRCS
+fileimpl.cpp)
+ENDIF (ZORBA_WITH_FILE_ACCESS)
+
IF (NOT ZORBA_NO_FULL_TEXT)
LIST(APPEND API_SRCS
stemmer.cpp
=== modified file 'src/api/fileimpl.cpp'
--- src/api/fileimpl.cpp 2012-09-19 21:16:15 +
+++ src/api/fileimpl.cpp 2013-01-24 02:29:23 +
@@ -102,7 +102,7 @@
ZORBA_CATCH
return lResult;
-};
+}
const std::string
FileImpl::getFileUri() const
@@ -136,7 +136,7 @@
ZORBA_CATCH
return lPath;
-};
+}
bool
FileImpl::isDirectory() const
@@ -148,7 +148,7 @@
ZORBA_CATCH
return lResult;
-};
+}
bool
FileImpl::isFile() const
=== modified file 'src/unit_tests/CMakeLists.txt'
--- src/unit_tests/CMakeLists.txt 2013-01-08 03:09:24 +
+++ src/unit_tests/CMakeLists.txt 2013-01-24 02:29:23 +
@@ -16,7 +16,6 @
