Changeset 11007

Timestamp:

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

Author:

eugene

Message:

fixed macro function error, added restrictions to book selections

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/macro.c (modified) (2 diffs)
• cmd.data/book_commands.c (modified) (3 diffs)
• include/data.h (modified) (1 diff)
• lib.data/page.c (modified) (2 diffs)
• lib.shell/ListOps.c (modified) (2 diffs)
• lib.shell/Makefile (modified) (1 diff)
• lib.shell/macro_funcs.c (added)

trunk/Ohana/src/opihi/cmd.basic/macro.c

@@ -1 +1 @@
 # include "basic.h"
-
-static Command macro_command[] = {
-  {"create", macro_create, "create a macro *"},
-  {"delete", macro_delete, "delete a macro *"},
-  {"list",   macro_list_f, "list a macro *"},
-  {"edit",   macro_edit,   "edit a macro <not working yet!> *"},
-  {"read",   macro_read,   "read a macro from a file <not working yet!> *"},
-  {"write",  macro_write,  "write a macro to a file <not working yet!> *"}
-};
 
 int macro (int argc, char **argv) {
@@ -27 +18 @@
   }
 
-  N = sizeof (macro_command) / sizeof (Command);
+  CommandF *cmd;
 
-  /* find the macro sub-command which matches from the list. */
-  /* if sub-command is not found, assume this is creating a new macro */
-  for (i = 0; i < N; i++) {
-    if (!strcmp (macro_command[i].name, argv[1])) {
-      status = (*macro_command[i].func) (argc - 1, argv + 1);
-      return (status);
-    }
+  cmd = find_macro_command (argv[1]);
+  if (cmd != NULL) {
+    status = (*cmd) (argc - 1, argv + 1);
+  } else {
+    /* sub-command was not found, pass argv[1..N] to macro_create */
+    status = macro_create (argc, argv);
   }
 
-  /* sub-command was not found, pass argv[1..N] to macro_create */
-  status = macro_create (argc, argv);
   return (status);
 }

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]);

trunk/Ohana/src/opihi/include/data.h

@@ -50 +50 @@
 Page *FindPage (Book *book, char *name);
 Page *GetPage (Book *book, int where);
+Page *GetPageRestricted (Book *book, int where, char *keyName, char *keyValue);
 Page *CreatePage (Book *book, char *name);
 int DeletePage (Book *book, Page *page);

trunk/Ohana/src/opihi/lib.data/page.c

@@ -24 +24 @@
 }
 
-/* return the given book */
+/* return the given page */
 Page *GetPage (Book *book, int where) {
 
@@ -33 +33 @@
   if (where >= book[0].Npages) return NULL;
   return (book[0].pages[where]);
+}
+
+/* return the given page with key restrictions */
+Page *GetPageRestricted (Book *book, int where, char *keyName, char *keyValue) {
+
+  int i;
+  int N, Nout;
+  char *value;
+
+  if (where < 0) where += book[0].Npages;
+  if (where < 0) return NULL;
+  if (where >= book[0].Npages) return NULL;
+
+  if (where >= 0) {
+    N = -1;
+    for (i = 0; (i < book[0].Npages) && (N < where); i++) {
+      value = BookGetWord (book[0].pages[i], keyName);
+      if ((value == NULL) && !strcmp (keyValue, "NULL")) {
+        N++;
+        Nout = i;
+      } 
+      if ((value != NULL) && !strcmp (keyValue, value)) {
+        N++;
+        Nout = i;
+      }
+    }
+  } else {
+    N = 0;
+    for (i = book[0].Npages - 1; (i >= 0) && (N > where); i--) {
+      value = BookGetWord (book[0].pages[i], keyName);
+      if ((value == NULL) && !strcmp (keyValue, "NULL")) {
+        N--;
+      } 
+      if ((value != NULL) && !strcmp (keyValue, value)) {
+        N--;
+      }
+    }
+  }
+
+  if (N != where) return NULL;
+
+  return (book[0].pages[Nout]);
 }
 

trunk/Ohana/src/opihi/lib.shell/ListOps.c

@@ -111 +111 @@
   char *comm;
   char *this_macro;
-
-  comm = thisword (line);
-  if (comm == (char *) NULL) return (FALSE);
+  CommandF *cmd;
+
+  comm = thisword (line);
+  if (comm == NULL) return (FALSE);
 
   status = !strcmp (comm, "macro");
@@ -120 +121 @@
   
   this_macro = thisword (nextword (line));
-
-  if (this_macro == (char *)NULL) return (FALSE);
-
-  N = sizeof (in_macro) / sizeof (Command);
-
-  /* find the macro sub-command which matches from the list. */
-  /* if sub-command is not found, assume this is creating a new macro */
-  for (i = 0; i < N; i++) {
-    if (!strcmp (in_macro[i].name, this_macro)) {
-      free (this_macro);
-      return (FALSE);
-    }
-  }
-
+  if (this_macro == NULL) return (FALSE);
+
+  cmd = find_macro_command (this_macro);
   free (this_macro);
+
+  if (cmd == NULL) {
+    return (FALSE);
+  }
+
   return (TRUE);
-
 }
 

trunk/Ohana/src/opihi/lib.shell/Makefile

@@ -22 +22 @@
 $(SDIR)/macro_delete.$(ARCH).o          \
 $(SDIR)/macro_edit.$(ARCH).o            \
+$(SDIR)/macro_funcs.$(ARCH).o           \
 $(SDIR)/macro_exec.$(ARCH).o            \
 $(SDIR)/macro_list.$(ARCH).o            \