Changeset 2042

Timestamp:

03/02/08 22:52:11 (2 months ago)

Author:

karpet

Message:

more refactoring of config/header

Files:

• libswish3/trunk/src/libswish3/Makefile.am (modified) (1 diff)
• libswish3/trunk/src/libswish3/config.c (modified) (9 diffs)
• libswish3/trunk/src/libswish3/hash.c (modified) (4 diffs)
• libswish3/trunk/src/libswish3/header.c (added)
• libswish3/trunk/src/libswish3/libswish3.h (modified) (5 diffs)
• libswish3/trunk/src/libswish3/swish.c (modified) (1 diff)
• libswish3/trunk/src/swish_header.c (modified) (4 diffs)

libswish3/trunk/src/libswish3/Makefile.am

@@ -28 +28 @@
-                        property.c \
-                        metaname.c \
+                        header.c \
-                        $(myheaders) 
-

libswish3/trunk/src/libswish3/config.c

@@ -82 +82 @@
-swish_free_config(swish_Config * config)
-{
-    int size = xmlHashSize(config->conf);
-
-    if (SWISH_DEBUG >= SWISH_DEBUG_CONFIG)
-    {
-        SWISH_DEBUG_MSG("freeing config");
-        SWISH_DEBUG_MSG("num of keys in config hash: %d", size);
-        SWISH_DEBUG_MSG("ptr addr: 0x%x  %d", (int) config, (int) config);
-    }
-
-conf
+misc
-    xmlHashFree(config->properties,     (xmlHashDeallocator)free_props);
-    xmlHashFree(config->metanames,      (xmlHashDeallocator)free_metas);
@@ -113 +110 @@
-
-
-memory stuff, env vars, and verify locale is corr
+config obj
-
-swish_Config  *
-swish_init_config()
-{
-
-    /* declare all our vars */
-    swish_Config  *config;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    swish_Property *tmpprop;
-    swish_MetaName *tmpmeta;
-
-    if (SWISH_DEBUG >= SWISH_DEBUG_CONFIG)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            (xmlChar*)SWISH_DEFAULT_METANAME,
-            swish_init_metaname( swish_xstrdup((xmlChar*)SWISH_DEFAULT_METANAME) ) 
-            );
-    swish_hash_add(
-meta
+config->metaname
-            (xmlChar*)SWISH_TITLE_METANAME,
-            swish_init_metaname( swish_xstrdup((xmlChar*)SWISH_TITLE_METANAME) )
@@ -154 +161 @@
-            
-    /* increm ref counts after they've been stashed. a little awkward, but saves var names... */
-meta
+config->metaname
-    tmpmeta->ref_cnt++;
-meta
+config->metaname
-    tmpmeta->ref_cnt++;
-    
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            (xmlChar *) "text/plain",
-            swish_xstrdup((xmlChar *) SWISH_PARSER_TXT));
-
+
+
-            (xmlChar *) "text/xml",
-            swish_xstrdup((xmlChar *) SWISH_PARSER_XML));
-
+
+
-            (xmlChar *) "text/html",
-            swish_xstrdup((xmlChar *) SWISH_PARSER_HTML));
-
+
+
-            (xmlChar *) SWISH_DEFAULT_PARSER,
-            swish_xstrdup((xmlChar *) SWISH_DEFAULT_PARSER_TYPE));
-
-
-
-
-
-
-
-
+
+
+
+
-            (xmlChar *) SWISH_INDEX_FORMAT,
-            swish_xstrdup((xmlChar *) SWISH_INDEX_FILEFORMAT));
-
+
+
-            (xmlChar *) SWISH_INDEX_NAME,
-            swish_xstrdup((xmlChar *) SWISH_INDEX_FILENAME));
-
+
+
-            (xmlChar *) SWISH_INDEX_LOCALE,
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            (xmlChar*)SWISH_PROP_DESCRIPTION,
-            swish_init_property(swish_xstrdup((xmlChar*)SWISH_PROP_DESCRIPTION))
-            );
-    swish_hash_add(
-prop
+config->properties
-            (xmlChar*)SWISH_PROP_TITLE,
-            swish_init_property(swish_xstrdup((xmlChar*)SWISH_PROP_TITLE))
@@ -214 +214 @@
-
-    /* same deal as metanames above */
-prop
+config->properties
-    tmpprop->ref_cnt++;
-prop
+config->properties
-    tmpprop->ref_cnt++;
-    
-    config->properties = prop;
-
-
-    /* aliases: other names a tag might be known as, for matching properties and
-     * metanames */
-
-
-
+
+
-            (xmlChar *) SWISH_TITLE_TAG,
-            swish_xstrdup((xmlChar *) SWISH_TITLE_METANAME));
-
+
+
-            (xmlChar *) SWISH_BODY_TAG,
-            swish_xstrdup((xmlChar *) SWISH_PROP_DESCRIPTION));
-
-    config->tag_aliases = alias;
-
-    /* misc default flags */
-
-
-
-
-
-
-
-
-
+
+
+
+
-        swish_debug_config(config);
-
-
+
+
-}
-
@@ -367 +358 @@
-
-            /* append value/args to any existing names in config */
-conf
+misc
-            {
-                /* err(202,"Bad 'name' tag contents in config: already
-                 * seen '%s'\n", opt_name); */
-conf
+misc
-                if (vhash == NULL)
-                {
@@ -389 +380 @@
-                name_seen = 0;
-
-xmlHashCreate
+swish_new_hash
-                if (vhash == NULL)
-                    SWISH_CROAK("error creating vhash");
@@ -432 +423 @@
-                    ||
-                    xmlStrEqual(opt_name, (xmlChar *) SWISH_PROP)
-
-
-
-
+
-                    )
-                {
@@ -476 +464 @@
-                    SWISH_DEBUG_MSG(" >>> adding %s to config hash ( name_seen = %d )", opt_name, name_seen);
-
-conf
+misc
-            }
-
@@ -514 +502 @@
-
-/* PUBLIC */
-
+
-swish_debug_config(swish_Config * config)
-{
-    int size = xmlHashSize(config->conf);
-
-    SWISH_DEBUG_MSG("config->ref_cnt = %d", config->ref_cnt);
-    SWISH_DEBUG_MSG("config->stash address = 0x%x  %d", (int) config->stash, (int) config->stash);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

libswish3/trunk/src/libswish3/hash.c

@@ -47 +47 @@
-}
-
-
-int 
+
+
-{
-    int ret;
@@ -58 +58 @@
-}
-
-
-int 
+
+
-{
-    int ret;
- 
+
-    if (ret == -1)
-        SWISH_CROAK("xmlHashRemoveEntry for %s failed", key);
@@ -75 +75 @@
-}
-
-
+
+
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
-        SWISH_CROAK("error creating hash of size %d", size);
-        return NULL;
@@ -86 +94 @@
-    return h;
-}
+
+static void
+merge_hashes( xmlHashTablePtr hash1, xmlChar *value, xmlChar *key )
+{
+    if (swish_hash_exists(hash1, key)) {
+        swish_hash_replace(hash1, key, value);
+    }
+    else {
+        swish_hash_add(hash1, key, value);
+    }
+}
+
+void
+swish_hash_merge( xmlHashTablePtr hash1, xmlHashTablePtr hash2 )
+{
+    xmlHashScan(hash2, (xmlHashScanner)merge_hashes, hash1);
+}

libswish3/trunk/src/libswish3/libswish3.h

@@ -52 +52 @@
-#define SWISH_INCLUDE_FILE          "IncludeConfigFile"
-#define SWISH_PROP                  "PropertyNames"
-#define SWISH_PROP_ASIS             "nostripchars"
-#define SWISH_PROP_MAX              "PropertyNamesMaxLength"
-#define SWISH_PROP_SORT             "PropertyNamesSortKeyLength"
-#define SWISH_META                  "MetaNames"
-#define SWISH_MIME                  "MIME"
@@ -206 +203 @@
-    int                          ref_cnt;
-    void                        *stash;      /* for bindings */
-conf;       /* misc settings */
+misc;
-    xmlHashTablePtr              properties;
-    xmlHashTablePtr              metanames;
@@ -374 +371 @@
-int         swish_hash_delete( xmlHashTablePtr hash, xmlChar *key );
-boolean     swish_hash_exists( xmlHashTablePtr hash, xmlChar *key );
+void        swish_hash_merge( xmlHashTablePtr hash1, xmlHashTablePtr hash2 );
+void *      swish_hash_fetch( xmlHashTablePtr hash, xmlChar *key );
-xmlHashTablePtr swish_new_hash(int size);
-/*
@@ -443 +442 @@
-*/
-swish_Config *  swish_init_config();
+void            swish_config_set_default( swish_Config *config );
+void            swish_config_merge(swish_Config *config1, swish_Config *config2);
-swish_Config *  swish_add_config( xmlChar * conf, swish_Config * config );
-swish_Config *  swish_parse_config( xmlChar * conf, swish_Config * config );
-int 
+void
-void            swish_free_config(swish_Config * config);
-xmlHashTablePtr swish_mime_hash();
@@ -593 +594 @@
-*/
-
+/*
+=head2 Header Functions
+*/
+boolean         swish_validate_header(char *filename);
+boolean         swish_merge_config_with_header(char *filename, swish_Config *c);
+/*
+=cut
+*/
+
-
-#ifdef __cplusplus

libswish3/trunk/src/libswish3/swish.c

@@ -34 +34 @@
-    s3->config      = swish_init_config();
-    s3->config->ref_cnt++;
+    swish_config_set_default( s3->config );
-    s3->analyzer    = swish_init_analyzer(s3->config);
-    s3->analyzer->ref_cnt++;

libswish3/trunk/src/swish_header.c

@@ -20 +20 @@
-/* check a swish3 header file for correct syntax */
-
-#include <libxml/xmlstring.h>
-#include <sys/param.h>
-#include <stdio.h>
@@ -28 +27 @@
-#include <locale.h>
-#include <err.h>
-
-
+
-#include "libswish3.h"
-
-extern int      SWISH_DEBUG;
-
-typedef struct {
-    boolean         isprops;
-    boolean         ismetas;
-    const xmlChar   *parent_name;
-    swish_Config    *config;
-} configmaker;
-
-static void
-do_property_aliases(
-    xmlChar *str,
-    configmaker *c,
-    swish_Property *prop
-)
-{
-    swish_StringList * strlist;
-    int i;
-
-    strlist = swish_make_stringlist(str);
-
-    /* loop over each alias and create a Property for each,
-       setting alias_for to prop->name
-    */
-    for (i=0; i < strlist->n; i++) {
-        
-        if (! swish_hash_exists( c->config->properties, strlist->word[i]) ) {
-            swish_Property *newprop = swish_init_property( swish_str_tolower(strlist->word[i]) );
-            newprop->ref_cnt++;
-            newprop->alias_for = swish_xstrdup( prop->name );
-            swish_hash_add( c->config->properties, newprop->name, newprop );
-            swish_debug_property(newprop);
-        } 
-        else {
-            SWISH_CROAK("Cannot alias Property %s to %s because %s is already a real Property",
-                strlist->word[i], prop->name, strlist->word[i]);
-        }
-   
-
-    }
-    
-    swish_free_stringlist(strlist);
-
-}
-
-
-static void
-do_property_attr(
-    const xmlChar *attr, 
-    const xmlChar *attr_val, 
-    swish_Property *prop,
-    configmaker *c
-)
-{
-
-    if (xmlStrEqual(attr, (xmlChar*)"ignore_case")) {
-        prop->ignore_case = (boolean)strtol((char*)attr_val, (char**)NULL, 10);
-    }
-    else if (xmlStrEqual(attr, (xmlChar*)"max")) {
-        prop->max = (int)strtol((char*)attr_val, (char**)NULL, 10);
-    }
-    else if (xmlStrEqual(attr, (xmlChar*)"verbatim")) {
-        prop->verbatim = (boolean)strtol((char*)attr_val, (char**)NULL, 10);
-    }
-    else if (xmlStrEqual(attr, (xmlChar*)"sort")) {
-        prop->sort = (boolean)strtol((char*)attr_val, (char**)NULL, 10);
-    }
-    else if (xmlStrEqual(attr, (xmlChar*)"type")) {
-        if (xmlStrEqual(attr_val, (xmlChar*)"int")) {
-            prop->type = SWISH_PROP_INT;
-        }
-        else if (xmlStrEqual(attr_val, (xmlChar*)"date")) {
-            prop->type = SWISH_PROP_DATE;
-        }
-        else {
-            prop->type = SWISH_PROP_STRING;
-        }
-    }
-    else if (xmlStrEqual(attr, (xmlChar*)"alias")) {
-        do_property_aliases( (xmlChar*)attr_val, c, prop );
-    }
-
-}
-
-static void
-do_property(xmlTextReaderPtr reader, configmaker *c) 
-{
-    xmlChar *value;
-    swish_Property *prop;
-    
-    prop  = swish_init_property( swish_str_tolower( (xmlChar*)xmlTextReaderConstName(reader) ) );
-    prop->ref_cnt++;
-    value = NULL;
-        
-    if (    xmlTextReaderHasValue(reader) 
-        &&  xmlTextReaderNodeType(reader) == XML_READER_TYPE_TEXT ) {
-        prop->name = swish_str_tolower( (xmlChar*)c->parent_name );
-        do_property_aliases( xmlTextReaderValue(reader), c, prop );
-        return;
-    }
-    
-    
-    if ( xmlTextReaderHasAttributes(reader) ) {
-    
-        xmlTextReaderMoveToFirstAttribute(reader);
-        do_property_attr(
-                xmlTextReaderConstName(reader),
-                xmlTextReaderConstValue(reader),
-                prop,
-                c
-                );
-        
-        while(xmlTextReaderMoveToNextAttribute(reader) == 1) {
-            do_property_attr(
-                xmlTextReaderConstName(reader),
-                xmlTextReaderConstValue(reader),
-                prop,
-                c
-                );
-        }
-    
-    }
-        
-    if (!swish_hash_exists( c->config->properties, prop->name )) {
-        swish_hash_add( c->config->properties, prop->name, prop );
-    } else {
-        swish_debug_config( c->config );
-        SWISH_CROAK("Property %s is already defined", prop->name);
-    }
-    
-    swish_debug_property(prop);
-    
-    if (value != NULL) {
-        xmlFree(value);
-    }
-    
-    c->parent_name = xmlTextReaderConstName(reader);
-
-}
-
-static void
-process_node(xmlTextReaderPtr reader, configmaker *c) 
-{
-    const xmlChar *name, *value;
-    xmlChar *attr, *attr_val;
-    int i, depth, type, is_empty, has_value, has_attr;
-
-    name = xmlTextReaderConstName(reader);
-    if (name == NULL)
-        name = BAD_CAST "--";
-
-    value = xmlTextReaderConstValue(reader);
-    
-    if (    swish_str_all_ws((xmlChar*)value) 
-        &&  xmlStrEqual(name, (xmlChar*)"#text")) 
-    {
-        return;
-    }
-
-    depth = xmlTextReaderDepth(reader);
-    type  = xmlTextReaderNodeType(reader);
-    is_empty    = xmlTextReaderIsEmptyElement(reader);
-    has_value   = xmlTextReaderHasValue(reader);
-    has_attr    = xmlTextReaderHasAttributes(reader);
-    
-
-    for (i=0; i < depth; i++) {
-        printf(" ");
-    }
-    printf("> %s [type: %d  is_empty: %d  has_value: %d  has_attr: %d]",
-        name, type, is_empty, has_value, has_attr
-    );
-    
-    if (has_attr) {
-    
-        printf("\n");
-        xmlTextReaderMoveToFirstAttribute(reader);
-        attr = xmlTextReaderName(reader);
-        attr_val = xmlTextReaderValue(reader);
-        printf("  attr: %s = %s ", attr, attr_val);
-        while(xmlTextReaderMoveToNextAttribute(reader) == 1) {
-            attr = xmlTextReaderName(reader);
-            attr_val = xmlTextReaderValue(reader);
-            printf(" attr: %s = %s  ", attr, attr_val);
-        }
-        
-    }
-    
-    xmlTextReaderMoveToElement(reader); // move back to element for do_property()
-
-    
-    if (value == NULL)
-            printf("\n");
-    else {
-        if (xmlStrlen(value) > 40)
-            printf(" value: %.40s...\n", value);
-        else
-            printf(" value: %s\n", value);
-    }
-    
-    if (type == XML_READER_TYPE_END_ELEMENT) {
-        if ( xmlStrEqual(name, (const xmlChar*)SWISH_PROP) ) {
-            c->isprops = 0;
-            return;
-        }
-        if ( xmlStrEqual(name, (const xmlChar*)SWISH_META) ) {
-            c->ismetas = 0;
-            return;
-        }
-    }
-    else {
-
-        if ( xmlStrEqual(name, (const xmlChar*)SWISH_PROP) ) {
-            c->isprops = 1;
-            return;
-        }
-        if ( xmlStrEqual(name, (const xmlChar*)SWISH_META) ) {
-            c->ismetas = 1;
-            return;
-        }
-        
-    }
-    
-    if (c->isprops && type != XML_READER_TYPE_END_ELEMENT) {
-        do_property(reader, c);
-    }
-    
-    
-    
-}
-
-
-static void
-read_header(const char *filename, configmaker *c) 
-{
-    xmlTextReaderPtr reader;
-    int ret;
-
-    reader = xmlReaderForFile(filename, NULL, 0);
-    if (reader != NULL) {
-        ret = xmlTextReaderRead(reader);
-        while (ret == 1) {
-            process_node(reader, c);
-            ret = xmlTextReaderRead(reader);
-        }
-        xmlFreeTextReader(reader);
-        if (ret != 0) {
-            SWISH_CROAK("%s : failed to parse\n", filename);
-        }
-    } else {
-        SWISH_CROAK("Unable to open %s\n", filename);
-    }
-}
-
-int 
@@ -291 +36 @@
-#ifdef LIBXML_READER_ENABLED
-    int i;
-    configmaker *c;
-    
-    c = swish_xmalloc(sizeof(configmaker));
-    c->config = swish_init_config();
-    c->isprops = 0;
-    c->ismetas = 0;
-
-    /*
-this initialize the library and check potential AB
+initialize the library and check potential AP
-     * between the version it was compiled for and the actual shared
-     * library used.
@@ -308 +47 @@
-
-        printf("config file %s\n", argv[i]);
-
+
+
+
+
+
+
-
-    }
-
-
-
-
-
+
-    /*
-     * Cleanup function for the XML library.