Diff of /trunk/src/gpx.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 34 by harbaum, Wed Jul 29 19:24:15 2009 UTC revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC
# Line 360  static gboolean skip_element(xmlTextRead Line 360  static gboolean skip_element(xmlTextRead
360    
361  static char *process_text(xmlTextReaderPtr reader) {  static char *process_text(xmlTextReaderPtr reader) {
362    char *text = NULL;    char *text = NULL;
363    int depth = xmlTextReaderDepth(reader);  
364    int ret = xmlTextReaderRead(reader);    if(!xmlTextReaderIsEmptyElement(reader)) {
365    while((ret == 1) &&  
366          ((xmlTextReaderNodeType(reader) != XML_READER_TYPE_END_ELEMENT) ||      int depth = xmlTextReaderDepth(reader);
367           (xmlTextReaderDepth(reader) != depth))) {      int ret = xmlTextReaderRead(reader);
368        while((ret == 1) &&
369      /* found a text fragment */            ((xmlTextReaderNodeType(reader) != XML_READER_TYPE_END_ELEMENT) ||
370      if((xmlTextReaderNodeType(reader) == XML_READER_TYPE_TEXT) ||             (xmlTextReaderDepth(reader) != depth))) {
371         (xmlTextReaderNodeType(reader) == XML_READER_TYPE_CDATA)) {  
372        char *frag = (char*)xmlTextReaderConstValue(reader);        /* found a text fragment */
373          if((xmlTextReaderNodeType(reader) == XML_READER_TYPE_TEXT) ||
374        if(!text) text = strdup(frag);           (xmlTextReaderNodeType(reader) == XML_READER_TYPE_CDATA)) {
375        else {          char *frag = (char*)xmlTextReaderConstValue(reader);
376          char *old = text;  
377          text = malloc(strlen(old) + strlen(frag) + 1);          if(!text) text = strdup(frag);
378          strcpy(text, old);          else {
379          strcat(text, frag);            char *old = text;
380          free(old);            text = malloc(strlen(old) + strlen(frag) + 1);
381              strcpy(text, old);
382              strcat(text, frag);
383              free(old);
384            }
385        }        }
386          ret = xmlTextReaderRead(reader);
387      }      }
     ret = xmlTextReaderRead(reader);  
388    }    }
389    
390    return text;    return text;
# Line 463  static log_t *process_gpx_wpt_gc_logs_lo Line 467  static log_t *process_gpx_wpt_gc_logs_lo
467      ret = xmlTextReaderRead(reader);      ret = xmlTextReaderRead(reader);
468    }    }
469    
470    g_assert(0);    gpx_free_log(log);
471    return log;    return NULL;
472  }  }
473    
474  static log_t *process_gpx_wpt_gc_logs(xmlTextReaderPtr reader) {  static log_t *process_gpx_wpt_gc_logs(xmlTextReaderPtr reader) {
# Line 513  static log_t *process_gpx_wpt_gc_logs(xm Line 517  static log_t *process_gpx_wpt_gc_logs(xm
517      ret = xmlTextReaderRead(reader);      ret = xmlTextReaderRead(reader);
518    }    }
519    
520    g_assert(0);    /* free the entire log chain */
521    return log_chain;    while(log_chain) {
522        log_t *next = log_chain->next;
523        gpx_free_log(log_chain);
524        log_chain = next;
525      }
526    
527      return NULL;
528  }  }
529    
530  static tb_t *process_gpx_wpt_gc_tbs_travelbug(xmlTextReaderPtr reader) {  static tb_t *process_gpx_wpt_gc_tbs_travelbug(xmlTextReaderPtr reader) {
# Line 532  static tb_t *process_gpx_wpt_gc_tbs_trav Line 542  static tb_t *process_gpx_wpt_gc_tbs_trav
542    else    else
543      tb->ref = strdup("<NONE>");      tb->ref = strdup("<NONE>");
544    
545      if((prop = (char*)xmlTextReaderGetAttribute(reader, BAD_CAST "id")))
546        tb->id = atoi(prop);
547    
548    /* process all sub-nodes */    /* process all sub-nodes */
549    int depth = xmlTextReaderDepth(reader);    int depth = xmlTextReaderDepth(reader);
550    int ret = xmlTextReaderRead(reader);    int ret = xmlTextReaderRead(reader);
# Line 563  static tb_t *process_gpx_wpt_gc_tbs_trav Line 576  static tb_t *process_gpx_wpt_gc_tbs_trav
576      ret = xmlTextReaderRead(reader);      ret = xmlTextReaderRead(reader);
577    }    }
578    
579    g_assert(0);    gpx_free_tb(tb);
580    return tb;    return NULL;
581  }  }
582    
583  static tb_t *process_gpx_wpt_gc_tbs(xmlTextReaderPtr reader) {  static tb_t *process_gpx_wpt_gc_tbs(xmlTextReaderPtr reader) {
# Line 605  static tb_t *process_gpx_wpt_gc_tbs(xmlT Line 618  static tb_t *process_gpx_wpt_gc_tbs(xmlT
618      ret = xmlTextReaderRead(reader);      ret = xmlTextReaderRead(reader);
619    }    }
620    
621    g_assert(0);    while(tb) {
622    return tb;      tb_t *next = tb;
623        gpx_free_tb(tb);
624        tb = next;
625      }
626    
627      return NULL;
628  }  }
629    
630  static void process_gpx_wpt_gc(xmlTextReaderPtr reader, cache_t *cache) {  static void process_gpx_wpt_gc(xmlTextReaderPtr reader, cache_t *cache) {
# Line 653  static void process_gpx_wpt_gc(xmlTextRe Line 671  static void process_gpx_wpt_gc(xmlTextRe
671                    (strcasecmp(name, "hints") == 0))     {                    (strcasecmp(name, "hints") == 0))     {
672            if(!cache->hint) {            if(!cache->hint) {
673              cache->hint = process_text(reader);              cache->hint = process_text(reader);
674    
675              /* often hints aren't more than just a bunch of blanks ... */              /* often hints aren't more than just a bunch of blanks ... */
676              if(cache->hint && all_is_white(cache->hint)) {              if(cache->hint && all_is_white(cache->hint)) {
677                free(cache->hint);                free(cache->hint);
# Line 831  static cache_t *process_gpx_wpt(xmlTextR Line 850  static cache_t *process_gpx_wpt(xmlTextR
850      ret = xmlTextReaderRead(reader);      ret = xmlTextReaderRead(reader);
851    }    }
852    
853    g_assert(0);    gpx_free_cache(cache);
854    return cache;    return NULL;
855  }  }
856    
857  static void process_gpx(xmlTextReaderPtr reader, gpx_dialog_t *dialog,  static gboolean process_gpx(xmlTextReaderPtr reader, gpx_dialog_t *dialog,
858                          gpx_t *gpx) {                              gpx_t *gpx) {
859    
860    /* no attributes of interest */    /* no attributes of interest */
861    
# Line 847  static void process_gpx(xmlTextReaderPtr Line 866  static void process_gpx(xmlTextReaderPtr
866    while(*cache) cache = &(*cache)->next;    while(*cache) cache = &(*cache)->next;
867    
868    const xmlChar *name = xmlTextReaderConstName(reader);    const xmlChar *name = xmlTextReaderConstName(reader);
869    g_assert(name);    if(!name) return FALSE;
870    
871    /* read next node */    /* read next node */
872    int ret = xmlTextReaderRead(reader);    int ret = xmlTextReaderRead(reader);
# Line 877  static void process_gpx(xmlTextReaderPtr Line 896  static void process_gpx(xmlTextReaderPtr
896      case XML_READER_TYPE_END_ELEMENT:      case XML_READER_TYPE_END_ELEMENT:
897        /* end element must be for the current element */        /* end element must be for the current element */
898        g_assert(xmlTextReaderDepth(reader) == 0);        g_assert(xmlTextReaderDepth(reader) == 0);
899        return;        return TRUE;
900        break;        break;
901    
902      default:      default:
# Line 886  static void process_gpx(xmlTextReaderPtr Line 905  static void process_gpx(xmlTextReaderPtr
905      ret = xmlTextReaderRead(reader);      ret = xmlTextReaderRead(reader);
906    }    }
907    
908    g_assert(0);    return FALSE;
909  }  }
910    
911  /* parse loc waypoint entry */  /* parse loc waypoint entry */
Legend:
Removed from v.34  
changed lines
  Added in v.133