Changeset 44

Timestamp:

10/30/2008 10:48:47 PM (14 years ago)

Author:

marcus

Message:

r29 | svn | 2008-02-23 23:02:22 +0100 (Sa, 23 Feb 2008) | 1 line

implemented trailer string in sfdb requests necessary for ingres

Location:

SH_SHM/trunk/source

Files:

• globalparams.c (modified) (3 diffs)
• globalparams.h (modified) (2 diffs)
• motif/cbutil.c (modified) (2 diffs)
• sqliface.c (modified) (5 diffs)

SH_SHM/trunk/source/globalparams.c

@@ -3 +3 @@
  *      ==============
  *
- * version 25, 2-Mar-2007
+ * $Revision: 29 $, $Date: 2008-02-23 23:02:22 +0100 (Sa, 23 Feb 2008) $
  *
  * Management of global parameters
@@ -333 +333 @@
         "sfdb_command",
         "sfdb_exec_qual",
+        "sfdb_trailer",
         "s_last_parameter"
 };
@@ -371 +372 @@
         "mysql sfdb",                    /* sfdb_command */
         "-B -e",                         /* sfdb_exec_qual */
+        "",                              /* sfdb_trailer */
         "s_last_parameter"               /* last parameter */
 };

SH_SHM/trunk/source/globalparams.h

@@ -3 +3 @@
  *      ==============
  *
- * version 25, 1-Mar-2007
+ * $Revision: 29 $, $Date: 2008-02-23 23:02:22 +0100 (Sa, 23 Feb 2008) $
  *
  * Management of global parameters
@@ -212 +212 @@
         cGpS_sfdb_command,
         cGpS_sfdb_exec_qual,
+        cGpS_sfdb_trailer,
         cGpS_last
 } TGpStringIndex;

SH_SHM/trunk/source/motif/cbutil.c

@@ -3 +3 @@
  *      ========
  *
- * version 100, 11-Jan-2007
+ * $Revision: 29 $, $Date: 2008-02-23 23:02:22 +0100 (Sa, 23 Feb 2008) $
  *
  * utility routines for callbacks
@@ -1632 +1632 @@
 
         XtManageChild( w );
+
+        if  (GpGetInt(cGpI_debug_level) > 3)
+                printf( "SHM-dbg4: cu_alert_message: after XtManageChild\n" );
 
 } /* end of cu_alert_message */

SH_SHM/trunk/source/sqliface.c

@@ -3 +3 @@
  *      ==========
  *
- * version 5, 6-Feb-2007
+ * $Revision: 29 $, $Date: 2008-02-23 23:02:22 +0100 (Sa, 23 Feb 2008) $
  *
  * Interface to SQL databases
@@ -214 +214 @@
                         + (double)entime.sec + (double)entime.ms/1000.0;
                 sprintf( shellcmd,
-                        "\\rm %s; %s %s \"select %s from sftab where (((edate > %d) OR (edate = %d AND etime >= %10.3lf)) AND ((sdate < %d) OR (sdate = %d AND stime <= %10.3lf))) ORDER BY sdate,stime\" >%s",
+                        "\\rm %s; %s %s \"select %s from sftab where (((edate > %d) OR (edate = %d AND etime >= %10.3lf)) AND ((sdate < %d) OR (sdate = %d AND stime <= %10.3lf))) ORDER BY sdate,stime\" %s >%s",
                         sqlv_sfdb_tmp, GpGetString(cGpS_sfdb_command),
                         GpGetString(cGpS_sfdb_exec_qual), TABLE_ELEMENTS, rd1date, rd1date,
-                        rd1time, rd2date, rd2date, rd2time, sqlv_sfdb_tmp );
+                        rd1time, rd2date, rd2date, rd2time, GpGetString(cGpS_sfdb_trailer),
+                        sqlv_sfdb_tmp );
                 if  (GpGetInt(cGpI_debug_level) > 2)
                         printf( "SH-dbg3: executing %s\nSH-dbg3: command line length %d\n",
@@ -379 +380 @@
                 /* not in cache, get it from database */
                 sprintf( shellcmd,
-                        "\\rm %s; %s %s \"select rootpath from pathtab where id = \'%d\'\" >%s",
+                        "\\rm %s; %s %s \"select rootpath from pathtab where id = \'%d\'\" %s >%s",
                         tmpfileb, GpGetString(cGpS_sfdb_command),
-                        GpGetString(cGpS_sfdb_exec_qual), pathid, tmpfileb );
+                        GpGetString(cGpS_sfdb_exec_qual), pathid,
+                        GpGetString(cGpS_sfdb_trailer), tmpfileb );
                 if  (GpGetInt(cGpI_debug_level) > 2)
                         printf( "SH-dbg3: executing %s\n", shellcmd );
@@ -616 +618 @@
                 if  (strcmp(namptr,"all") == 0 || strcmp(namptr,"ALL") == 0)  {
                         /* get really all stations from database */
-                        sprintf( sql, "\\rm %s; %s %s \"select station from staadm order by netpri,station\" >%s",
+                        sprintf( sql, "\\rm %s; %s %s \"select station from staadm order by netpri,station\" %s >%s",
                                 scrfil, GpGetString(cGpS_sfdb_command),
-                                GpGetString(cGpS_sfdb_exec_qual), scrfil );
+                                GpGetString(cGpS_sfdb_exec_qual), GpGetString(cGpS_sfdb_trailer),
+                                scrfil );
                 } else if  (strncmp(namptr,"net:",4) == 0 || strncmp(namptr,"NET:",4) == 0)  {
                         /* get stations of a net from database */
                         namptr += 4;
-                        sprintf( sql, "\\rm %s; %s %s \"select station from staadm where netpri='%s' order by netpri,station\" >%s",
+                        sprintf( sql, "\\rm %s; %s %s \"select station from staadm where netpri='%s' order by netpri,station\" %s >%s",
                                 scrfil, GpGetString(cGpS_sfdb_command),
-                                GpGetString(cGpS_sfdb_exec_qual), namptr, scrfil );
+                                GpGetString(cGpS_sfdb_exec_qual), namptr,
+                                GpGetString(cGpS_sfdb_trailer), scrfil );
                 } else {
 
                         /* assume name is a attribute name, request value */
-                        sprintf( sql, "\\rm %s; %s %s \"select attrflag from staattr where attrname='%s'\" >%s",
+                        sprintf( sql, "\\rm %s; %s %s \"select attrflag from staattr where attrname='%s'\" %s >%s",
                                 scrfil, GpGetString(cGpS_sfdb_command),
-                                GpGetString(cGpS_sfdb_exec_qual), namptr, scrfil );
+                                GpGetString(cGpS_sfdb_exec_qual), namptr,
+                                GpGetString(cGpS_sfdb_trailer), scrfil );
                         if  (GpGetInt(cGpI_debug_level) > 2)
                                 printf( "SH-dbg3: execute %s\n", sql );
@@ -653 +658 @@
 
                         /* get flagged stations from database */
-                        sprintf( sql, "\\rm %s; %s %s \"select station from staadm where staflags&%d order by netpri,station\" >%s",
+                        sprintf( sql, "\\rm %s; %s %s \"select station from staadm where staflags&%d order by netpri,station\" %s >%s",
                                 scrfil, GpGetString(cGpS_sfdb_command),
-                                GpGetString(cGpS_sfdb_exec_qual), flagval, scrfil );
+                                GpGetString(cGpS_sfdb_exec_qual), flagval,
+                                GpGetString(cGpS_sfdb_trailer), scrfil );
 
                 } /*endif*/