Changeset 35237 for trunk/Ohana/src/opihi

Timestamp:

Mar 5, 2013, 2:33:50 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130207

Location:

trunk/Ohana/src/opihi

Files:

• . (modified) (1 prop)
• cmd.astro (modified) (1 prop)
• cmd.basic/Makefile (modified) (1 diff)
• cmd.basic/init.c (modified) (2 diffs)
• cmd.basic/scannext.c (copied) (copied from branches/eam_branches/ipp-20130207/Ohana/src/opihi/cmd.basic/scannext.c )
• cmd.data (modified) (1 prop)
• cmd.data/Makefile (modified) (1 diff)
• cmd.data/dbadmin.c (copied) (copied from branches/eam_branches/ipp-20130207/Ohana/src/opihi/cmd.data/dbadmin.c )
• cmd.data/dbupdate.c (copied) (copied from branches/eam_branches/ipp-20130207/Ohana/src/opihi/cmd.data/dbupdate.c )
• cmd.data/init.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.basic/Makefile

@@ -48 +48 @@
 $(SRC)/run_while.$(ARCH).o  \
 $(SRC)/scan.$(ARCH).o        \
+$(SRC)/scannext.$(ARCH).o            \
 $(SRC)/shell.$(ARCH).o       \
 $(SRC)/sprintf.$(ARCH).o    \

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

@@ -35 +35 @@
 int run_while       PROTO((int, char **));
 int scan            PROTO((int, char **));
+int scannext        PROTO((int, char **));
 int shell           PROTO((int, char **));
 int sprintf_opihi   PROTO((int, char **));
@@ -86 +87 @@
   {1, "while",         run_while,          "while loop"}, 
   {1, "scan",          scan,               "scan line from keyboard or file to variable *"},
+  {1, "scannext",      scannext,           "scan next line from file to variable (file stays open)"},
   {1, "!",             shell,              "system call"},
   {1, "exec",          shell,              "system call"},

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -43 +43 @@
 $(SRC)/dbselect.$(ARCH).o       \
 $(SRC)/dbinsert.$(ARCH).o       \
+$(SRC)/dbadmin.$(ARCH).o        \
+$(SRC)/dbupdate.$(ARCH).o       \
 $(SRC)/erase.$(ARCH).o          \
 $(SRC)/extract.$(ARCH).o        \

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

@@ -25 +25 @@
 int dbselect         PROTO((int, char **));
 int dbinsert         PROTO((int, char **));
+int dbadmin          PROTO((int, char **));
+int dbupdate         PROTO((int, char **));
 int delete           PROTO((int, char **));
 int densify          PROTO((int, char **));
@@ -172 +174 @@
   {1, "dbselect",     dbselect,         "extract vectors from mysql database table"},
   {1, "dbinsert",     dbinsert,         "sql insert command"},
+  {1, "dbadmin",      dbadmin,          "sql admin command (create, drop)"},
+  {1, "dbupdate",     dbupdate,         "sql update command"},
   {1, "delete",       delete,           "delete vectors or images"},
   {1, "densify",      densify,          "create an image histogram from a set of vectors"},