From 0ff132b5390add5513c51beb875627dab3769a69 Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Sat, 20 May 2023 06:33:36 -0700 Subject: [PATCH 1/2] Update Makefile.am --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0db6dce7e..d51faa7e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,7 +130,7 @@ $(PYENV): requirements.txt @python$(PYVER)-config --prefix 1>/dev/null || ( echo "ERROR [Makefile]: python$(PYVER)-dev is not installed" > /dev/stderr ; false ) @echo "Processing python requirements..." @mkdir -p $(PYBIN) $(PYLIB) $(PYINC) - @(deactivate || true ; $(SYSPYTHON) -m venv $(PYENV)) + @(deactivate >/dev/null || true ; $(SYSPYTHON) -m venv $(PYENV)) @$(ENVPYTHON) --version 1>/dev/null || ( echo "ERROR [Makefile]: $(ENVPYTHON) is not found" > /dev/stderr ; false ) @$(ENVPYTHON) -m pip install --upgrade pip @$(ENVPYTHON) -m pip install pandas==2.0.0 From e8e8d230be6614d2559bbe6b0da76b0f9d6cf58a Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Sat, 20 May 2023 06:33:48 -0700 Subject: [PATCH 2/2] Update cmdarg.cpp Fix citation formatting --- source/cmdarg.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/cmdarg.cpp b/source/cmdarg.cpp index bb86da24d..873cbfb54 100644 --- a/source/cmdarg.cpp +++ b/source/cmdarg.cpp @@ -2172,7 +2172,7 @@ DEPRECATED static int cite(void *main, int argc, const char *argv[]) IN_MYCONTEXT output_error("unable to open origin file"); return CMDERR; } - char url[1024] = ""; + char url[1024] = BUILD_URL "/tree/" BUILD_ID; if ( ! feof(fp) ) { char line[1024]; @@ -2191,10 +2191,6 @@ DEPRECATED static int cite(void *main, int argc, const char *argv[]) *end = '\0'; strcpy(url,line+2); } - else - { - strcpy(url,global_urlbase); - } } fclose(fp); @@ -2234,13 +2230,17 @@ DEPRECATED static int cite(void *main, int argc, const char *argv[]) output_message("\turl = {%s}",url); output_message("}"); } + else if (strchr(argv[0],'=')) + { + output_error("format '%s' is invalid",strchr(argv[0],'=')+1); + } else { output_message("Chassin, D.P., et al., \"%s %s-%d (%s)" " %s\" (%d) [online]." - " Available at %s. Accessed %s. %d, %d", + " Available at %s. Accessed %d %s %d.", PACKAGE_NAME, PACKAGE_VERSION, BUILDNUM, BRANCH, - platform, year, url, Month[month-1], day, year); + platform, year, url, day, Month[month-1], year); } global_suppress_repeat_messages = old; return 0;