[Refdb-cvs] CVS: refdb/src refdbda.c,1.41.2.16,1.41.2.17

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26911/src

Modified Files:
      Tag: Release_0_9_5_stable
	refdbda.c 
Log Message:
viewstat output now uses new libdbi function to retrieve engine version

Index: refdbda.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbda.c,v
retrieving revision 1.41.2.16
retrieving revision 1.41.2.17
diff -u -U2 -r1.41.2.16 -r1.41.2.17
--- refdbda.c	29 Jul 2005 21:15:41 -0000	1.41.2.16
+++ refdbda.c	15 Aug 2005 00:21:55 -0000	1.41.2.17
@@ -464,9 +464,9 @@
   dbi_driver driver; /* libdbi driver structure */
   dbi_result dbires; /* libdbi result structure */
-  short int dbversioninfo = 0;
   char* outstring; /* ptr to a buffer for output */
   char* outbuffer; /* ptr to a buffer for output */
-  const char* versioninfo = NULL;
+  short int dbversioninfo;
   char sql_command[64];
+  char db_version[VERSIONSTRING_LENGTH];
 
   /* get a buffer to hold output data */
@@ -501,15 +501,6 @@
 
     /* obtain database server version info */
-    sprintf(sql_command, "SELECT VERSION()");
-    dbires = dbi_conn_query(conn, sql_command);
-    LOG_PRINT(LOG_DEBUG, sql_command);
-    if (dbires) {
-      if (dbi_result_next_row(dbires)) {
-	versioninfo = dbi_result_get_string_idx(dbires, 1); /* 1-base index */
-      }
-    }
-    /* else: treat as non-critical as some db engines do not support this
-       SQL command */
-    
+    dbi_conn_get_engine_version_string(conn, db_version);
+  
     sprintf(outbuffer, "You are served by: %s %s\nClient IP: %s\nConnected via %s driver (%s)\nto: %s\ndb version: %d\nserverip: %s\ntimeout: %s\ndbs_port: %s\nlogfile: %s\nlogdest: %s\nloglevel: %s\nremoteadmin: %s\npidfile: %s\n",
 	    PACKAGE,
@@ -518,5 +509,5 @@
 	    dbi_driver_get_name(driver),
 	    dbi_driver_get_version(driver),
-	    (versioninfo) ? versioninfo : "unknown",
+	    db_version,
 	    dbversioninfo,
 	    ptr_clrequest->server_ip,
@@ -529,8 +520,4 @@
 	    pid_file);
 
-    if (dbires) {
-      dbi_result_free(dbires);
-    }
-
     /* all fine */
     send_status(ptr_clrequest->fd, 0, TERM_NO);