Changeset 2125

Timestamp:

04/15/08 10:02:40 (1 month ago)

Author:

karpet

Message:

new config type for stringlists

Files:

• libswish3/trunk/src/libswish3/config.c (modified) (11 diffs)
• libswish3/trunk/src/libswish3/header.c (modified) (6 diffs)

libswish3/trunk/src/libswish3/config.c

@@ -54 +54 @@
-    xmlChar *key
-);
+static void stringlist_printer(
+    swish_StringList *strlist,
+    xmlChar *str,
+    xmlChar *key
+);
-static void property_printer(
-    swish_Property *prop,
@@ -82 +87 @@
-    xmlHashTablePtr metas2
-);
+static void
+free_stringlist(
+    swish_StringList *strlist,
+    xmlChar *key
+);
-
-static void
@@ -93 +103 @@
-
-    swish_xfree(payload);
+}
+
+static void
+free_stringlist(
+    swish_StringList *strlist,
+    xmlChar *key
+)
+{
+    int i;
+    if (SWISH_DEBUG & SWISH_DEBUG_CONFIG) {
+        SWISH_DEBUG_MSG("   freeing config->stringlists %s [%d strings]", key, strlist->n);
+        for(i=0; i<strlist->n; i++) {
+            SWISH_DEBUG_MSG("     string: %s", strlist->word[i]);
+        }
+    }
+
+    swish_free_stringlist(strlist);
-}
-
@@ -145 +172 @@
-    xmlHashFree(config->mimes, (xmlHashDeallocator)free_string);
-    xmlHashFree(config->index, (xmlHashDeallocator)free_string);
+    xmlHashFree(config->stringlists, (xmlHashDeallocator)free_stringlist);
-    swish_free_config_flags(config->flags);
-
@@ -165 +193 @@
-    flags = swish_xmalloc(sizeof(swish_ConfigFlags));
-    flags->tokenize = 1;
+    flags->context_as_meta = 0;
-    flags->meta_ids = swish_init_hash(8);
-    flags->prop_ids = swish_init_hash(8);
@@ -204 +233 @@
-    config->index = swish_init_hash(8);
-    config->tag_aliases = swish_init_hash(8);
+    config->stringlists = swish_init_hash(8);
-    config->mimes = NULL;
-    config->ref_cnt = 0;
@@ -338 +368 @@
-}
-
+static void 
+stringlist_printer(
+    swish_StringList *strlist,
+    xmlChar *str,
+    xmlChar *key
+)
+{
+    int i;
+    for(i=0; i<strlist->n; i++) {
+        SWISH_DEBUG_MSG(" %s: %s => %s", str, key, strlist->word[i]);
+    }
+}
+
-static void
-property_printer(
@@ -372 +415 @@
-
-    xmlHashScan(config->misc, (xmlHashScanner)config_printer, "misc conf");
+    xmlHashScan(config->stringlists, (xmlHashScanner)stringlist_printer, "stringlists");
-    xmlHashScan(config->properties, (xmlHashScanner)property_printer, "properties");
-    xmlHashScan(config->metanames, (xmlHashScanner)metaname_printer, "metanames");
@@ -475 +519 @@
-}
-
+static void
+copy_strlist(
+    swish_StringList *strlist2,
+    xmlHashTablePtr strlists1,
+    xmlChar *key
+)
+{
+    swish_StringList *strlist1;
+    if (swish_hash_exists(strlists1, key)) {
+        strlist1 = swish_hash_fetch(strlists1, key);
+        swish_merge_stringlists(strlist2, strlist1);
+    }
+    else {
+        strlist1 = swish_copy_stringlist(strlist2);
+        swish_hash_add(strlists1, key, strlist1);
+    }
+}
+
+static void
+merge_stringlists(
+    xmlHashTablePtr strlists1,
+    xmlHashTablePtr strlists2
+)
+{
+    xmlHashScan(strlists2, (xmlHashScanner)copy_strlist, strlists1);
+}
+
-void
-swish_config_merge(
@@ -517 +588 @@
-    }
-    swish_hash_merge(config1->misc, config2->misc);
+    
+    if (SWISH_DEBUG & SWISH_DEBUG_CONFIG) {
+        SWISH_DEBUG_MSG("merge stringlists");
+    }
+    merge_stringlists(config1->stringlists, config2->stringlists);
-
-    if (SWISH_DEBUG & SWISH_DEBUG_CONFIG) {
@@ -523 +599 @@
-
-/* set flags */
+/* TODO pull these settings from config proper. but where in process? */
-    config1->flags->tokenize = config2->flags->tokenize;
+    config1->flags->context_as_meta = config2->flags->context_as_meta;
-
-    if (SWISH_DEBUG & SWISH_DEBUG_CONFIG) {

libswish3/trunk/src/libswish3/header.c

@@ -94 +94 @@
-    xmlChar *name
-);
+static void
+read_key_value_stringlist(
+    xmlTextReaderPtr reader,
+    xmlHashTablePtr hash,
+    xmlChar *name
+);
-static void read_header(
-    char *filename,
@@ -497 +503 @@
-        && xmlStrEqual(name, (xmlChar *)"#text")) {
-        return;
-
+            
-
-    if (type == XML_READER_TYPE_END_ELEMENT) {
@@ -531 +537 @@
-    }
-    else {
-
+
+
+
+
+
+
+
+
+
+
+
-            h->isprops = 1;
-            return;
@@ -583 +599 @@
-        else if (h->isalias) {
-            read_key_values_pair(reader, h->config->tag_aliases, (xmlChar *)name);
+            return;
+        }
+        else if (xmlStrEqual((xmlChar *)SWISH_CLASS_ATTRIBUTES, (xmlChar *)name)) {
+            read_key_value_stringlist(reader, h->config->stringlists, (xmlChar *)name);
-            return;
-        }
@@ -596 +616 @@
-    }
-
+}
+
+static void
+read_key_value_stringlist(
+    xmlTextReaderPtr reader,
+    xmlHashTablePtr hash,
+    xmlChar *name
+)
+{
+    swish_StringList *strlist;
+    xmlChar *str;
+    const xmlChar *value;
+
+/* element. get text and add to misc */
+    if (xmlTextReaderRead(reader) == 1) {
+        if (xmlTextReaderNodeType(reader) == XML_READER_TYPE_TEXT) {
+
+            value = xmlTextReaderConstValue(reader);
+            str = swish_str_tolower((xmlChar *)value);
+            strlist = swish_make_stringlist(str);
+            if (swish_hash_exists(hash, name)) {
+                swish_merge_stringlists(strlist, swish_hash_fetch(hash, name));
+            }
+            else {
+                swish_hash_add(hash, name, strlist);
+            }
+            swish_xfree(str);
+        }
+        else {
+            SWISH_CROAK("header line missing value: %s", name);
+        }
+    }
+    else {
+        SWISH_CROAK("error reading value for header element %s", name);
+    }
-}
-
@@ -654 +709 @@
-    if (xmlTextReaderRead(reader) == 1) {
-        if (xmlTextReaderNodeType(reader) == XML_READER_TYPE_TEXT) {
-
+            
-/*  SWISH_DEBUG_MSG("read key %s for value %s", name, value);  */
-            if (swish_hash_exists(hash, name)) {