Changeset 11232

Timestamp:

Jan 22, 2007, 2:54:39 PM (19 years ago)

Author:

eugene

Message:

added -setword

File:

• trunk/Ohana/src/opihi/pantasks/ipptool2book.c (modified) (3 diffs)

trunk/Ohana/src/opihi/pantasks/ipptool2book.c

@@ -2 +2 @@
 
 # define FREEKEYS \
-  if (keys) { for (i = 0; i < Nkeys; i++) { free (keys[i]); } free (keys); }
+  if (keys) { for (i = 0; i < Nkeys; i++) { free (keys[i]); } free (keys); } \
+  for (i = 0; i < setWordN; i++) { free (setWordList[i]); free (setWordValue[i]); } \
+  free (setWordValue); free (setWordList);
 
 // convert the named queue with ipptool metadata output into book format
@@ -10 +12 @@
   char *line, *tmpword, *tmpvalue;
   char pagename[512], *bookName, **keys, *p, *q;
+  char **setWordList;
+  char **setWordValue;
+  int setWordN, setWordNalloc;
   Page *page;
   Book *book;
   Queue *queue;
+
+  /* supply additional constant words */
+  setWordN = 0;
+  setWordNalloc = 10;
+  ALLOCATE (setWordList, char *, setWordNalloc);
+  ALLOCATE (setWordValue, char *, setWordNalloc);
+  while ((N = get_argument (argc, argv, "-setword"))) {
+    remove_argument (N, &argc, argv);
+    setWordList[setWordN] = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+    setWordValue[setWordN] = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+    setWordN ++;
+    if (setWordN >= setWordNalloc) {
+      setWordNalloc += 10;
+      REALLOCATE (setWordList, char *, setWordNalloc);
+      REALLOCATE (setWordValue, char *, setWordNalloc);
+    }      
+  }
 
   Unique = FALSE;
@@ -172 +196 @@
       }
 
+      // add the fixed words to the page
+      for (i = 0; i < setWordN; i++) {
+        BookSetWord (page, setWordList[i], setWordValue[i]);
+      }
+
       onPage = FALSE;
       continue;