Changeset 3672

Timestamp:

09/30/08 11:33:58 (2 months ago)

Author:

bricks

Message:

added and changed traces
changed validation of xml declaration

Location:

format-plugins/tomboy-note

Files:

• CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)
• src/tomboy_note.c (modified) (32 diffs)
• tests/CMakeLists.txt (modified) (1 diff)
• tests/parser_test.c (modified) (10 diffs)

format-plugins/tomboy-note/CMakeLists.txt

@@ -20 +20 @@
 ADD_SUBDIRECTORY( src )
 IF ( CHECK_FOUND )
-    ADD_SUBDIRECTORY( tests )
+   # ADD_SUBDIRECTORY( tests )
 ENDIF( CHECK_FOUND)
 
+# add uninstall target
+CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
 OPENSYNC_PACKAGE( ${PROJECT_NAME} ${VERSION} )

format-plugins/tomboy-note/src/CMakeLists.txt

@@ -1 +1 @@
 LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} )
 INCLUDE_DIRECTORIES( ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
-
-#OPENSYNC_PLUGIN_ADD( tomboy-sync tomboy_sync.c )
-
-#TARGET_LINK_LIBRARIES( tomboy-sync ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} )
-
-###### INSTALL ################### 
-#OPENSYNC_PLUGIN_INSTALL( tomboy-sync ) 
-
-#OPENSYNC_PLUGIN_CONFIG( tomboy-sync )
 
 OPENSYNC_FORMAT_ADD( tomboynote tomboy_note.c )

format-plugins/tomboy-note/src/tomboy_note.c

@@ -2 +2 @@
  * tomboy_note - convert tomboy notes to xmlformat-note and backwards
  * Copyright (C) 2008  Bjoern Ricks <bjoern.ricks@gmail.com>
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- * 
+ *
  */
 
@@ -25 +25 @@
 
 osync_bool tomboynote_validate(xmlDocPtr doc) {
+        //TODO: use xml schema validation
+        osync_trace(TRACE_ENTRY, "%s (%p)", __func__, doc);
         osync_assert(doc);
-        osync_trace(TRACE_ENTRY, "%s (%p)", __func__, doc);
-        
+
         xmlNodePtr rootnode;
         rootnode = xmlDocGetRootElement(doc);
-        
+
         if (rootnode == NULL) {
-                return FALSE;
-        }
-        
-        if ( xmlStrEqual(rootnode->name, BAD_CAST "note")  ) { //TODO: use xml schema validation
+                osync_trace(TRACE_EXIT, "%s", __func__);
+                return FALSE;
+        }
+
+        if ( xmlStrEqual(rootnode->name, BAD_CAST "note")  ) {
                 osync_trace(TRACE_EXIT, "%s", __func__);
                 return TRUE;
         }
-        osync_trace(TRACE_EXIT, "%s", __func__);        
+        osync_trace(TRACE_EXIT, "%s", __func__);
         return FALSE;
 }
@@ -45 +47 @@
 GList * tomboynote_parse_tags(xmlDocPtr doc) {
         osync_assert(doc);
-        
+
         xmlNodePtr tag;
         xmlNodePtr cur;
-        
+
         GList* list = NULL;
-        
+
         for ( cur = xmlDocGetRootElement(doc)->children; cur != NULL; cur = cur->next ) {
                 if ( xmlStrEqual(cur->name, BAD_CAST "tags") ) { // <tags> found
@@ -68 +70 @@
         osync_assert(doc);
         osync_assert(nodename);
-        
+
         xmlNodePtr cur;
         for (cur = xmlDocGetRootElement(doc)->children; cur != NULL; cur = cur->next) {
                 if ( xmlStrEqual(cur->name, BAD_CAST nodename) && cur->children != NULL ) { // <nodename> found
-                        return (const char *)cur->children->content; 
+                        return (const char *)cur->children->content;
                 }
         }
@@ -98 +100 @@
                                         tomboynote_parse_content_node(cur->children, output);
                                 }
-                                        else if ( xmlStrEqual(cur->name, BAD_CAST "bold") ) {
-                                                //TODO add plain bold format
-                                                tomboynote_parse_content_node(cur->children, output);
-                                        }
-                                        else if ( xmlStrEqual(cur->name, BAD_CAST "italic") ) {
-                                            //TODO add plain italic format
-                                                tomboynote_parse_content_node(cur->children, output);
-                                        }
-                                        else if ( xmlStrEqual(cur->name, BAD_CAST "monospace") ) {
-                                            //TODO add plain monospace format
-                                                tomboynote_parse_content_node(cur->children, output);
-                                        }
-                                        // add link declaration
-                                        else if ( xmlStrEqual(cur->ns->href, BAD_CAST "http://beatniksoftware.com/tomboy/link") ) {
-                                                tomboynote_parse_content_node(cur->children, output);
-                                        }
-                                        // add size decleration
-                                        else if ( xmlStrEqual(cur->ns->href, BAD_CAST "http://beatniksoftware.com/tomboy/size") ) {
-                                                tomboynote_parse_content_node(cur->children, output);
-                                        }
-                                        // add listitems
-                                        else if ( xmlStrEqual(cur->name, BAD_CAST "list") ) {
-                                                xmlNodePtr listitem;
-                                                xmlAttrPtr attribute;
-                                                for ( listitem = cur->children; listitem != NULL; listitem = listitem->next ) {
-                                                        if ( xmlStrEqual(listitem->name , BAD_CAST "list-item" ) ) {
-                                                                attribute = listitem->properties; //TODO iterate through attributes
-                                                                if ( xmlStrEqual(attribute->name, BAD_CAST "dir") ) {
-                                                                        output = g_string_append(output, "* "); 
-                                                                }
-                                                                tomboynote_parse_content_node(listitem->children, output);
-                                                                output = g_string_append(output, "\n");
+                                else if ( xmlStrEqual(cur->name, BAD_CAST "bold") ) {
+                                        //TODO add plain bold format
+                                        tomboynote_parse_content_node(cur->children, output);
+                                }
+                                else if ( xmlStrEqual(cur->name, BAD_CAST "italic") ) {
+                                        //TODO add plain italic format
+                                        tomboynote_parse_content_node(cur->children, output);
+                                }
+                                else if ( xmlStrEqual(cur->name, BAD_CAST "monospace") ) {
+                                        //TODO add plain monospace format
+                                        tomboynote_parse_content_node(cur->children, output);
+                                }
+                                // add link declaration
+                                else if ( xmlStrEqual(cur->ns->href, BAD_CAST "http://beatniksoftware.com/tomboy/link") ) {
+                                        tomboynote_parse_content_node(cur->children, output);
+                                }
+                                // add size decleration
+                                else if ( xmlStrEqual(cur->ns->href, BAD_CAST "http://beatniksoftware.com/tomboy/size") ) {
+                                        tomboynote_parse_content_node(cur->children, output);
+                                }
+                                // add listitems
+                                else if ( xmlStrEqual(cur->name, BAD_CAST "list") ) {
+                                        xmlNodePtr listitem;
+                                        xmlAttrPtr attribute;
+                                        for ( listitem = cur->children; listitem != NULL; listitem = listitem->next ) {
+                                                if ( xmlStrEqual(listitem->name , BAD_CAST "list-item" ) ) {
+                                                        attribute = listitem->properties; //TODO iterate through attributes
+                                                        if ( xmlStrEqual(attribute->name, BAD_CAST "dir") ) {
+                                                                output = g_string_append(output, "* ");
                                                         }
+                                                        tomboynote_parse_content_node(listitem->children, output);
+                                                        output = g_string_append(output, "\n");
                                                 }
                                         }
                                 }
+                        }
                 }
         }
@@ -139 +141 @@
 
 void tomboynote_parse_content(xmlDocPtr doc, GString * output) {
+
+        osync_trace(TRACE_ENTRY, "%s (%p,%p)", __func__, doc, output);
+        osync_assert(doc);
+        osync_assert(output);
+
         xmlNodePtr cur;
-        xmlXPathContextPtr xpathCtx; 
+        xmlXPathContextPtr xpathCtx;
         xmlXPathObjectPtr xpathObj;
         xmlNodeSetPtr nodes;
         int size;
 
-        osync_trace(TRACE_ENTRY, "%s (%p,%p)", __func__, doc, output);
-        
         xpathCtx = xmlXPathNewContext(doc);
         if (xpathCtx == NULL) {
@@ -158 +163 @@
         }
         xpathObj = xmlXPathEvalExpression(BAD_CAST "/tomboy:note/tomboy:text/tomboy:note-content/node()", xpathCtx);
-        if ( xpathObj != NULL ) {               
+        if ( xpathObj != NULL ) {
                 nodes = xpathObj->nodesetval;
                 size = (nodes) ? nodes->nodeNr : 0;
@@ -174 +179 @@
 osync_bool conv_tomboynote_to_xmlformat(char *data, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error) {
         osync_trace(TRACE_ENTRY, "start:%s", __func__);
-        
+
         xmlDocPtr doc;
-        xmlParserCtxtPtr ctxt; 
+        xmlParserCtxtPtr ctxt;
 
         OSyncXMLField * xmlfield;
@@ -189 +194 @@
                 return FALSE;
         }
-        
+
         ctxt = xmlNewParserCtxt();
         if ( ctxt == NULL ) {
+                osync_trace(TRACE_EXIT, "%s", __func__);
                 return FALSE;
         }
@@ -201 +207 @@
 
         str = g_string_new("");
-        
+
         OSyncXMLFormat * xmlformat = osync_xmlformat_new("note", error);
-        
+
         // parse tomboy tags as Categories
         list_tags = tomboynote_parse_tags(doc);
@@ -220 +226 @@
                 osync_xmlfield_set_attr(xmlfield, "TimezoneID", "UTC" ); //TODO get timezone info
         }
-        
+
         // parse content as description
         tomboynote_parse_content(doc, str);
@@ -234 +240 @@
                 osync_xmlfield_set_attr(xmlfield, "TimezoneID", "UTC" ); //TODO get timezone info
         }
-        
+
         //parse title as summary
         node_data = tomboynote_parse_node(doc, "title");
@@ -241 +247 @@
                 osync_xmlfield_set_key_value(xmlfield, "Content", node_data);
         }
-        
-        *free_input = TRUE;
-        *output = (char *)xmlformat;
-        *outpsize = osync_xmlformat_size();
+
         // debug output
         unsigned int size;
@@ -252 +255 @@
         osync_xmlformat_sort(xmlformat);
         osync_trace(TRACE_SENSITIVE, "... Output XMLFormat is: \n%s", cstr);
+        *free_input = TRUE;
+        *output = (char *)xmlformat;
+        *outpsize = osync_xmlformat_size();
         g_free(cstr);
+        xmlFreeDoc(doc);
         osync_trace(TRACE_EXIT, "%s", __func__);
         return TRUE;
-        
-        xmlFreeDoc(doc);
+
 FREE_CONTEXT:
         xmlFreeParserCtxt(ctxt);
         osync_trace(TRACE_EXIT_ERROR, "%s", __func__);
-        return FALSE;   
+        return FALSE;
 }
 
 osync_bool conv_xmlformat_to_tomboynote(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error)
 {
+        osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error);
+
         xmlNsPtr ns;
         xmlDocPtr doc;
@@ -278 +286 @@
         xmlAttrPtr version;
         xmlAttrPtr xml_preserve;
-        
+
         const char * content_text;
-        
-        osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error);
-        
+
         doc = xmlNewDoc(BAD_CAST "1.0");
         ns = xmlNewNs(NULL, BAD_CAST "http://beatniksoftware.com/tomboy", NULL);
-        
+
         note = xmlNewNode(ns, BAD_CAST "note");
         version = xmlNewProp(note, BAD_CAST "version", BAD_CAST "0.3" );
@@ -300 +306 @@
         create_date = xmlNewNode(ns, BAD_CAST "create-date");
         last_change_date = xmlNewNode(ns, BAD_CAST "last-change-date");
-        
+
         // Print input XMLFormat into terminal
         OSyncXMLFormat *xmlformat = (OSyncXMLFormat *)input;
@@ -306 +312 @@
         char *str;
         osync_xmlformat_assemble(xmlformat, &str, &size);
-        osync_trace(TRACE_SENSITIVE, "Input XMLFormat is:\n%s", str);
+        osync_trace(TRACE_INTERNAL, "Input XMLFormat is:\n%s", str);
         g_free(str);
-        
+
         OSyncXMLField *xmlfield = osync_xmlformat_get_first_field(xmlformat);
         for(; xmlfield != NULL; xmlfield = osync_xmlfield_get_next(xmlfield)) {
@@ -336 +342 @@
         // add <last-change-date>
         xmlAddChild(note, last_change_date);
-        // add <last-metadata-change-date> 
+        // add <last-metadata-change-date>
         // don't know the difference between last-change-date and last-metadata-change-date
         // it seems that always both are changed
-        tmp_node = xmlNewNode(ns, BAD_CAST "last-metadata-change-date" ); 
+        tmp_node = xmlNewNode(ns, BAD_CAST "last-metadata-change-date" );
         xmlNodeSetContent(tmp_node, xmlStrdup(last_change_date->content));
         xmlAddChild(note, tmp_node);
         // add <create-date>
-        xmlAddChild(note, create_date); 
+        xmlAddChild(note, create_date);
         // add <cursor-position>
-        tmp_node = xmlNewNode(ns, BAD_CAST "cursor-position" ); 
+        tmp_node = xmlNewNode(ns, BAD_CAST "cursor-position" );
         xmlNodeSetContent(tmp_node, BAD_CAST "1"); // first position
         xmlAddChild(note, tmp_node);
@@ -372 +378 @@
         xmlNodeSetContent(tmp_node, BAD_CAST "FALSE");
         xmlAddChild(note, tmp_node);
-        
+
         *free_input = TRUE;
         xmlDocDumpFormatMemory(doc, (xmlChar **)output, (int *)outpsize, 1);
@@ -379 +385 @@
                 return FALSE;
         }
-                        
+
         osync_trace(TRACE_EXIT, "%s", __func__);
         return TRUE;
@@ -385 +391 @@
 
 osync_bool detect_tomboynote(const char *data, int size) {
-        osync_trace(TRACE_ENTRY, "start:%s (%p,%d)", __func__, data, size);
-        
+        osync_trace(TRACE_ENTRY, "%s (%p,%d)", __func__, data, size);
+
         xmlDocPtr doc;
         xmlParserCtxtPtr ctxt;
-        
+
         if (!data) {
                 return FALSE;
@@ -395 +401 @@
         /* TODO change xml check
          * The g_pattern_match* functions match a string against a pattern containing '*' and '?' wildcards with similar semantics as the standard glob() function: '*' matches an arbitrary, possibly empty, string, '?' matches an arbitrary character.
-         * Note that in contrast to glob(), the '/' character can be matched by the wildcards, there are no '[...]' character ranges and '*' and '?' can not be escaped to include them literally in a pattern. 
+         * Note that in contrast to glob(), the '/' character can be matched by the wildcards, there are no '[...]' character ranges and '*' and '?' can not be escaped to include them literally in a pattern.
          */
-        if (!g_pattern_match_simple("?<?xml version=\"1.0\"*?>*", data)) {
+        if (!g_pattern_match_simple("?*<*xml version=\"1.0\"*?>*", data)) {
                 osync_trace(TRACE_EXIT, "%s not xml data", __func__);
                 return FALSE;
         }
-        
+
         ctxt = xmlNewParserCtxt();
         if (ctxt == NULL) {
@@ -409 +415 @@
         doc = xmlCtxtReadMemory(ctxt,data,size,NULL,NULL,0);
         if (doc == NULL) {
-                osync_trace(TRACE_EXIT, "%s", __func__);
                 goto FREE_CONTEXT;
         }
-        
-        if ( tomboynote_validate(doc) ) {
-                osync_trace(TRACE_EXIT, "%s valid tomboy-note", __func__);
-                return TRUE;
-        }
-        
+
+        if ( !tomboynote_validate(doc) ) {
+                goto FREE_DOC;
+        }
+        xmlFreeDoc(doc);
+        xmlFreeParserCtxt(ctxt);
+        osync_trace(TRACE_EXIT, "%s valid tomboy-note", __func__);
+        return TRUE;
+
+FREE_DOC:
         xmlFreeDoc(doc);
 FREE_CONTEXT:
@@ -429 +438 @@
 static void destroy_tomboynote(char *input, unsigned int inpsize)
 {
-        free(input);
+        g_free(input);
 }
 
 static void create_tomboynote(char **data, unsigned int *size) {
+        osync_trace(TRACE_ENTRY, "%s (%p,%p)", __func__, data, size);
+
         xmlNsPtr ns;
         xmlDocPtr doc;
         xmlNodePtr node;
         xmlAttrPtr version;
-        
+
         doc = xmlNewDoc(BAD_CAST "1.0");
         ns = xmlNewNs(NULL, NULL, BAD_CAST "http://beatniksoftware.com/tomboy");
-        
+
         node = xmlNewNode(ns, BAD_CAST "note");
         version = xmlNewProp(node, BAD_CAST "version", BAD_CAST "0.3" );
         xmlDocSetRootElement(doc, node);
-        
+
         xmlDocDumpFormatMemory(doc, (xmlChar **)data, (int *)size, 1);
         if (!*data) {
@@ -452 +463 @@
         xmlFreeNode(node);
         xmlFreeNs(ns);
+
+        osync_trace(TRACE_EXIT, "%s", __func__ );
 }
 
@@ -458 +471 @@
         //TODO
         return OSYNC_CONV_DATA_MISMATCH;
-} 
+}
 */
 
@@ -464 +477 @@
 {
         OSyncObjFormat *format = osync_objformat_new("tomboy-note", "note", error);
-        if (!format)
-                return FALSE;
-        
+        if (!format) {
+                return FALSE;
+        }
+
         osync_objformat_set_create_func(format, create_tomboynote);
         osync_objformat_set_destroy_func(format, destroy_tomboynote);
-        
+
 /*      osync_objformat_set_compare_func(format, compare_tomboynote);
         osync_objformat_set_duplicate_func(format, duplicate_xmlformat);
@@ -481 +495 @@
         osync_objformat_set_demarshal_func(format, demarshal_xmlformat);
         */
-        
+
         osync_format_env_register_objformat(env, format);
         osync_objformat_unref(format);
@@ -495 +509 @@
                 return FALSE;
         }
-        
+
         OSyncObjFormat *tomboynote = osync_format_env_find_objformat(env, "tomboy-note");
         if (!tomboynote) {
@@ -501 +515 @@
                 return FALSE;
         }
-        
+
         OSyncFormatConverter *conv = osync_converter_new_detector(plain, tomboynote, detect_tomboynote, error);
         if (!conv)
@@ -507 +521 @@
         osync_format_env_register_converter(env, conv);
         osync_converter_unref(conv);
-        
+
         OSyncObjFormat *xmlformat = osync_format_env_find_objformat(env, "xmlformat-note");
         if (!xmlformat) {
-                /* This is the first error that occurs if /usr/lib/opensync-1.0/formats 
-                 is not populated correctly.  So report it! */
                 osync_trace(TRACE_ERROR, "Unable to find object format xmlformat-note");
                 return FALSE;
@@ -532 +544 @@
         osync_format_env_register_converter(env, conv);
         osync_converter_unref(conv);
-        
+
         return TRUE;
 }
-        
+
 int get_version (void)
 {

format-plugins/tomboy-note/tests/CMakeLists.txt

@@ -2 +2 @@
 LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} )
 
-ADD_EXECUTABLE( parser_test parser_test.c ../src/tomboy_note.c)
+ADD_EXECUTABLE( parser_test parser_test.c ../src/tomboy_note.c ../src/tomboy_note_doc.c)
 
 TARGET_LINK_LIBRARIES( parser_test ${LIBXML2_LIBRARIES} ${GLIB2_LIBRARIES} ${OPENSYNC_LIBRARIES} ${CHECK_LIBRARIES} )

format-plugins/tomboy-note/tests/parser_test.c

@@ -2 +2 @@
  * parser_test - test parsing of tomboy notes
  * Copyright (C) 2008  Bjoern Ricks <bjoern.ricks@gmail.com>
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public