xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more verbose nativeLib rary.ohd.whfs

Browse source
This commit is contained in:
mjames-upc 2017-07-10 13:58:01 -06:00
parent 6ca59e9abe
commit 42175d9009
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nativeLib/build.native/build.sh
View file

@ -96,6 +96,10 @@ else
eclipse_dir=$(get_full_path $1) eclipse_dir=$(get_full_path $1)
fi fi
echo "Using $eclipse_dir"
#exit
echo "Cleaning Eclipse plugins... " echo "Cleaning Eclipse plugins... "
rm -vf $eclipse_dir/plugins/com.raytheon* rm -vf $eclipse_dir/plugins/com.raytheon*

11
nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/DbmsAccess.pgc
View file

@ -26,13 +26,8 @@ int OpenDbms(const char *dbmsname) {
char * db_host = getAppDefault("pghost"); char * db_host = getAppDefault("pghost");
char * db_port = getAppDefault("pgport"); char * db_port = getAppDefault("pgport");
char * db_user = getAppDefault("pguser"); 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" snprintf(sqlstmt,sizeof(sqlstmt), "%s@%s:%s?user=%s",db_name,db_host,dp_port,db_user);
"&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);
printf("Connecting to database '%s' as user '%s'\n", sqlstmt, 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 ; EXEC SQL CONNECT TO :sqlstmt ;
if (SQLCODE < 0) { 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); SQLCODE);
result=errSqlFail; result=errSqlFail;
goto freeALL; goto freeALL;
@ -51,8 +46,6 @@ freeALL:
free(db_host); free(db_host);
free(db_port); free(db_port);
free(db_user); free(db_user);
free(ssl_home);
free(ssl_mode);
return (result); return (result);

2
nativeLib/rary.ohd.whfs/src/DBMSUtil/TEXT/startdb.pgc
View file

@ -24,7 +24,7 @@ void startdb(long int *return_code)
char * db_port = getAppDefault("pgport"); char * db_port = getAppDefault("pgport");
db_user = getAppDefault("pguser"); 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); printf("Connecting to database '%s' as user '%s'\n", sqlstmt, db_user);

2
nativeLib/rary.ohd.whfs/src/hydrobrief/TEXT/HydroBriefDLT.cxx
View file

@ -47,7 +47,7 @@ int HydroBriefDLT::openDatabase()
else else
{ {
printf("Unable to open database %s\n", databaseName); printf("HydroBriefDLT: Unable to open database %s\n", databaseName);
isDbOpen = 0; isDbOpen = 0;
exit(-4); exit(-4);
} }

2
nativeLib/rary.ohd.whfs/src/load_linesegs/TEXT/lineseg_main.c
View file

@ -71,7 +71,7 @@ static void get_lineseg_options(const int argc,
ret = OpenDbms(dbms); ret = OpenDbms(dbms);
if (ret != 0) if (ret != 0)
{ {
fprintf(stderr, "Unable to open database: %s\n", fprintf(stderr, "lineseg_main: Unable to open database: %s\n",
dbms); dbms);
exit(-2); exit(-2);
} }