1. Reworked the xmlDocToJSON and _xmlDocToJSON functions for clarity. In particular: _xmlDocToJSON() now returns void, and requires its second parameter (the jsonObject*) to be non-NULL. The old version behaved differently depending on whether the second parameter was NULL. I found that arrangement confusing. 2. Finished adding doxygen-style comments; removed comments from the header so that they won't override the more complete comments in the implementation file. 3. Tinkered with white space here and there. M include/opensrf/xml_utils.h M src/libopensrf/xml_utils.c git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1928 9efc2488-bf62-4759-914b-345cdb29e865
1. Change xmlSaxAttr() to return const char* instead of non-const char*. 2. Add some doxygen-style comments. 3. Tidy up the white space here and there. M include/opensrf/xml_utils.h M src/libopensrf/xml_utils.c git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1927 9efc2488-bf62-4759-914b-345cdb29e865
Rename macro for compilation guard; prepare for #inclusion in C++ git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1590 9efc2488-bf62-4759-914b-345cdb29e865
Patch from Scott McKellar (including commentary): 1. I added the const qualifier to the second parameter of xmlSaxAttr(). 2. I moved the prototype of _xmlToJSON() from the header to the implementation file, and made the function static. At least in its present form, _xmlToJSON should not be part of the public interface because it is confusing. Sometimes it allocates a new jsonObject, which needs to be freed, and sometimes it doesn't. A better design would be for it to expect to receive a non-NULL pointer to an existing jsonObject. Since it is called in only one place (other than a couple of recursive calls), this would be an easy change to make. However I left it alone -- as long as the function is visible only from within its own source file, the potential for confusion is limited. git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1244 9efc2488-bf62-4759-914b-345cdb29e865
Merging changes from branches/new-json2 svn merge -r1006:1012 svn://svn.open-ils.org/OpenSRF/branches/new-json2 svn merge -r1018:1019 svn://svn.open-ils.org/OpenSRF/branches/new-json2 svn merge -r1022:1025 svn://svn.open-ils.org/OpenSRF/branches/new-json2 svn merge -r1026:1028 svn://svn.open-ils.org/OpenSRF/branches/new-json2 svn merge -r1036:1037 svn://svn.open-ils.org/OpenSRF/branches/new-json2 svn merge -r1039:1040 svn://svn.open-ils.org/OpenSRF/branches/new-json2 svn merge -r1041:1043 svn://svn.open-ils.org/OpenSRF/branches/new-json2 svn merge -r1045:1048 svn://svn.open-ils.org/OpenSRF/branches/new-json2 This moves OpenSRF to the new JSON wire protocol, including: a new C parser a new osrfList based string_array module a compatibility layer for mimicking libobjson and legacy JSON I/O in the HTTP gateway a small JSON test program for profiling, etc. git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1051 9efc2488-bf62-4759-914b-345cdb29e865
Merged libopensrf source directories (libtransport, libstack, and utils) into a single libopensrf directory Moved opensrf headers to trunk/include/opensrf Moved objson headers to trunk/include/objson Updated #include's throughout to be fully qualified. e.g. <opensrf/utils.h>, <objson/object.h> Removed old, unused trunk/src/xinclude code Cleaned up Makefiles to support new directory layout git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@957 9efc2488-bf62-4759-914b-345cdb29e865