Changeset 11007 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Jan 10, 2007, 7:43:40 AM (20 years ago)

Author:

eugene

Message:

fixed macro function error, added restrictions to book selections

File:

• trunk/Ohana/src/opihi/cmd.data/book_commands.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/book_commands.c

@@ -220 +220 @@
 
   int where, N;
-  char *varName;
+  char *varName, *keyName, *keyValue;
   Book *book;
   Page *page;
@@ -231 +231 @@
   }
 
+  keyName = NULL;
+  if ((N = get_argument (argc, argv, "-key"))) {
+    remove_argument (N, &argc, argv);
+    keyName = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+    keyValue = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   if (argc != 3) {
-    gprint (GP_ERR, "USAGE: book getpage (book) (where) [-var var]\n");
+    gprint (GP_ERR, "USAGE: book getpage (book) (where) [-var var] [-key key value]\n");
     return FALSE;
   }
@@ -244 +253 @@
   }
 
-  page = GetPage (book, where);
+  if (keyName == NULL) {
+    page = GetPage (book, where);
+  } else {
+    page = GetPageRestricted (book, where, keyName, keyValue);
+  }
   if (page == NULL) {
     gprint (GP_ERR, "page %s in book %s not found\n", argv[2], argv[1]);