From 42175d9009e39efb607093517d7a3d06b5cfc026 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 10 Jul 2017 13:58:01 -0600 Subject: [PATCH] more verbose nativeLib rary.ohd.whfs --- nativeLib/build.native/build.sh | 4 ++++ .../rary.ohd.whfs/src/DBMSUtil/TEXT/DbmsAccess.pgc | 11 ++--------- nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/startdb.pgc | 2 +- .../src/hydrobrief/TEXT/HydroBriefDLT.cxx | 2 +- .../src/load_linesegs/TEXT/lineseg_main.c | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/nativeLib/build.native/build.sh b/nativeLib/build.native/build.sh index 825a089124..bb127cc591 100755 --- a/nativeLib/build.native/build.sh +++ b/nativeLib/build.native/build.sh @@ -96,6 +96,10 @@ else eclipse_dir=$(get_full_path $1) fi + +echo "Using $eclipse_dir" +#exit + echo "Cleaning Eclipse plugins... " rm -vf $eclipse_dir/plugins/com.raytheon* diff --git a/nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/DbmsAccess.pgc b/nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/DbmsAccess.pgc index 6b997c1589..14d69b985c 100644 --- a/nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/DbmsAccess.pgc +++ b/nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/DbmsAccess.pgc @@ -26,13 +26,8 @@ int OpenDbms(const char *dbmsname) { char * db_host = getAppDefault("pghost"); char * db_port = getAppDefault("pgport"); char * db_user = getAppDefault("pguser"); - char * ssl_home = getAppDefault("DB_ssl_cert_dir"); - char * ssl_mode = getAppDefault("DB_ssl_mode"); - snprintf(sqlstmt,sizeof(sqlstmt), "tcp:postgresql://%s:%s/%s?user=%s&sslmode=%s" - "&sslkey=%s/%s.key&sslcert=%s/%s.crt&sslrootcert=%s/root.crt" - ,db_host,db_port,db_name,db_user,ssl_mode,ssl_home,db_user, - ssl_home,db_user,ssl_home); + snprintf(sqlstmt,sizeof(sqlstmt), "%s@%s:%s?user=%s",db_name,db_host,dp_port,db_user); printf("Connecting to database '%s' as user '%s'\n", sqlstmt, db_user); @@ -40,7 +35,7 @@ int OpenDbms(const char *dbmsname) { EXEC SQL CONNECT TO :sqlstmt ; if (SQLCODE < 0) { - fprintf(stderr, "Unable to open database %s - (%ld)\n", dbmsname, + fprintf(stderr, "DbmsAccess: Unable to open database %s - (%ld)\n", dbmsname, SQLCODE); result=errSqlFail; goto freeALL; @@ -51,8 +46,6 @@ freeALL: free(db_host); free(db_port); free(db_user); - free(ssl_home); - free(ssl_mode); return (result); diff --git a/nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/startdb.pgc b/nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/startdb.pgc index 32ace7576e..33a5828666 100644 --- a/nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/startdb.pgc +++ b/nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/startdb.pgc @@ -24,7 +24,7 @@ void startdb(long int *return_code) char * db_port = getAppDefault("pgport"); db_user = getAppDefault("pguser"); - sprintf(sqlstmt, "tcp:postgresql://%s:%s/%s", db_host, db_port, db_name); + sprintf(sqlstmt, "%s@%s:%s?user=%s",db_name,db_host,dp_port,db_user); printf("Connecting to database '%s' as user '%s'\n", sqlstmt, db_user); diff --git a/nativeLib/rary.ohd.whfs/src/hydrobrief/TEXT/HydroBriefDLT.cxx b/nativeLib/rary.ohd.whfs/src/hydrobrief/TEXT/HydroBriefDLT.cxx index b2528de61e..baf138d6be 100644 --- a/nativeLib/rary.ohd.whfs/src/hydrobrief/TEXT/HydroBriefDLT.cxx +++ b/nativeLib/rary.ohd.whfs/src/hydrobrief/TEXT/HydroBriefDLT.cxx @@ -47,7 +47,7 @@ int HydroBriefDLT::openDatabase() else { - printf("Unable to open database %s\n", databaseName); + printf("HydroBriefDLT: Unable to open database %s\n", databaseName); isDbOpen = 0; exit(-4); } diff --git a/nativeLib/rary.ohd.whfs/src/load_linesegs/TEXT/lineseg_main.c b/nativeLib/rary.ohd.whfs/src/load_linesegs/TEXT/lineseg_main.c index db0a744042..2a6e45c03b 100644 --- a/nativeLib/rary.ohd.whfs/src/load_linesegs/TEXT/lineseg_main.c +++ b/nativeLib/rary.ohd.whfs/src/load_linesegs/TEXT/lineseg_main.c @@ -71,7 +71,7 @@ static void get_lineseg_options(const int argc, ret = OpenDbms(dbms); if (ret != 0) { - fprintf(stderr, "Unable to open database: %s\n", + fprintf(stderr, "lineseg_main: Unable to open database: %s\n", dbms); exit(-2); }