- add join_dup helper, cleanup code

[platform/upstream/libsolv.git] / ext / repo_zyppdb.c

diff --git a/ext/repo_zyppdb.c b/ext/repo_zyppdb.c
index 13086d9..e511872 100644 (file)
--- a/ext/repo_zyppdb.c
+++ b/ext/repo_zyppdb.c
@@ -79,13 +79,12 @@ struct parsedata {
 
   struct stateswitch *swtab[NUMSTATES];
   enum state sbtab[NUMSTATES];
+  struct joindata jd;
 
   const char *tmplang;
 
   Solvable *solvable;
   Id handle;
-
-  Id langcache[ID_NUM_INTERNAL];
 };
 
 
@@ -94,41 +93,23 @@ struct parsedata {
  * find value for xml attribute
  * I: txt, name of attribute
  * I: atts, list of key/value attributes
- * I: dup, strdup it
  * O: pointer to value of matching key, or NULL
  *
  */
 
 static inline const char *
-find_attr(const char *txt, const char **atts, int dup)
+find_attr(const char *txt, const char **atts)
 {
   for (; *atts; atts += 2)
     {
       if (!strcmp(*atts, txt))
-        return dup ? strdup(atts[1]) : atts[1];
+        return atts[1];
     }
   return 0;
 }
 
 
 /*
- * create localized tag
- */
-
-static Id
-langtag(struct parsedata *pd, Id tag, const char *language)
-{
-  if (language && !language[0])
-    language = 0;
-  if (!language || tag >= ID_NUM_INTERNAL)
-    return pool_id2langid(pd->repo->pool, tag, language, 1);
-  if (!pd->langcache[tag])
-    pd->langcache[tag] = pool_id2langid(pd->repo->pool, tag, language, 1);
-  return pd->langcache[tag];
-}
-
-
-/*
  * XML callback: startElement
  */
 
@@ -141,7 +122,7 @@ startElement(void *userData, const char *name, const char **atts)
   struct stateswitch *sw;
 
 #if 0
-      fprintf(stderr, "start: [%d]%s\n", pd->state, name);
+  fprintf(stderr, "start: [%d]%s\n", pd->state, name);
 #endif
   if (pd->depth != pd->statedepth)
     {
@@ -179,27 +160,25 @@ startElement(void *userData, const char *name, const char **atts)
     case STATE_PRODUCT:
       {
        /* parse 'type' */
-       const char *type = find_attr("type", atts, 0);
+       const char *type = find_attr("type", atts);
        s = pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo));
        repodata_extend(pd->data, s - pool->solvables);
        pd->handle = s - pool->solvables;
        if (type)
-         {
-           repodata_set_str(pd->data, pd->handle, PRODUCT_TYPE, type);
-         }
+         repodata_set_str(pd->data, pd->handle, PRODUCT_TYPE, type);
       }
       break;
     case STATE_VERSION:
       {
-       const char *ver = find_attr("ver", atts, 0);
-       const char *rel = find_attr("rel", atts, 0);
-       /* const char *epoch = find_attr("epoch", atts, 1); ignored */
-       s->evr = makeevr(pd->pool, join2(ver, "-", rel));
+       const char *ver = find_attr("ver", atts);
+       const char *rel = find_attr("rel", atts);
+       /* const char *epoch = find_attr("epoch", atts); ignored */
+       s->evr = makeevr(pd->pool, join2(&pd->jd, ver, "-", rel));
       }
       break;
       /* <summary lang="xy">... */
     case STATE_SUMMARY:
-      pd->tmplang = find_attr("lang", atts, 1);
+      pd->tmplang = join_dup(&pd->jd, find_attr("lang", atts));
       break;
     default:
       break;
@@ -214,7 +193,7 @@ endElement(void *userData, const char *name)
   Solvable *s = pd->solvable;
 
 #if 0
-      fprintf(stderr, "end: [%d]%s\n", pd->state, name);
+  fprintf(stderr, "end: [%d]%s\n", pd->state, name);
 #endif
   if (pd->depth != pd->statedepth)
     {
@@ -231,25 +210,25 @@ endElement(void *userData, const char *name)
   switch (pd->state)
     {
     case STATE_PRODUCT:
-
       if (!s->arch)
        s->arch = ARCH_NOARCH;
-      if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)
-       s->provides = repo_addid_dep(pd->repo, s->provides, rel2id(pd->pool, s->name, s->evr, REL_EQ, 1), 0);
+      if (!s->evr)
+       s->evr = ID_EMPTY;
+      if (s->name && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)
+       s->provides = repo_addid_dep(pd->repo, s->provides, pool_rel2id(pd->pool, s->name, s->evr, REL_EQ, 1), 0);
       pd->solvable = 0;
       break;
     case STATE_NAME:
-      s->name = str2id(pd->pool, join2("product", ":", pd->content), 1);
+      s->name = pool_str2id(pd->pool, join2(&pd->jd, "product", ":", pd->content), 1);
       break;
     case STATE_ARCH:
-      s->arch = str2id(pd->pool, pd->content, 1);
+      s->arch = pool_str2id(pd->pool, pd->content, 1);
       break;
     case STATE_SUMMARY:
-      repodata_set_str(pd->data, pd->handle, langtag(pd, SOLVABLE_SUMMARY, pd->tmplang), pd->content);
-      pd->tmplang = sat_free((void *)pd->tmplang);
+      repodata_set_str(pd->data, pd->handle, pool_id2langid(pd->pool, SOLVABLE_SUMMARY, pd->tmplang, 1), pd->content);
       break;
     case STATE_VENDOR:
-      s->vendor = str2id(pd->pool, pd->content, 1);
+      s->vendor = pool_str2id(pd->pool, pd->content, 1);
       break;
     case STATE_INSTALLTIME:
       repodata_set_num(pd->data, pd->handle, SOLVABLE_INSTALLTIME, atol(pd->content));
@@ -261,7 +240,7 @@ endElement(void *userData, const char *name)
   pd->docontent = 0;
 
 #if 0
-      fprintf(stderr, "end: [%s] -> %d\n", name, pd->state);
+  fprintf(stderr, "end: [%s] -> %d\n", name, pd->state);
 #endif
 }
 
@@ -272,14 +251,8 @@ characterData(void *userData, const XML_Char *s, int len)
   struct parsedata *pd = userData;
   int l;
   char *c;
-  if (!pd->docontent) {
-#if 0
-    char *dup = strndup( s, len );
-  fprintf(stderr, "Content: [%d]'%s'\n", pd->state, dup );
-  free( dup );
-#endif
+  if (!pd->docontent)
     return;
-  }
   l = pd->lcontent + len + 1;
   if (l > pd->acontent)
     {
@@ -317,7 +290,7 @@ add_zyppdb_product(struct parsedata *pd, FILE *fp)
       l = fread(buf, 1, sizeof(buf), fp);
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
        {
-         pool_debug(pd->pool, SAT_ERROR, "repo_zyppdb: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+         pool_debug(pd->pool, SOLV_ERROR, "repo_zyppdb: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
          return;
        }
       if (l == 0)
@@ -345,11 +318,7 @@ repo_add_zyppdb_products(Repo *repo, const char *dirpath, int flags)
   FILE *fp;
   Repodata *data;
   
-  if (!(flags & REPO_REUSE_REPODATA))
-    data = repo_add_repodata(repo, 0);
-  else
-    data = repo_last_repodata(repo);
-
+  data = repo_add_repodata(repo, flags);
   memset(&pd, 0, sizeof(pd));
   pd.repo = repo;
   pd.pool = repo->pool;
@@ -372,7 +341,7 @@ repo_add_zyppdb_products(Repo *repo, const char *dirpath, int flags)
        {
          if (strlen(entry->d_name) < 3)
            continue;   /* skip '.' and '..' */
-         fullpath = join2(dirpath, "/", entry->d_name);
+         fullpath = join2(&pd.jd, dirpath, "/", entry->d_name);
          if ((fp = fopen(fullpath, "r")) == 0)
            {
              perror(fullpath);
@@ -384,9 +353,8 @@ repo_add_zyppdb_products(Repo *repo, const char *dirpath, int flags)
     }
   closedir(dir);
 
-  sat_free((void *)pd.tmplang);
   free(pd.content);
-  join_freemem();
+  join_freemem(&pd.jd);
   if (!(flags & REPO_NO_INTERNALIZE))
     repodata_internalize(data);
 }