Changeset 42993

Timestamp:

Apr 22, 2026, 11:56:11 AM (2 weeks ago)

Author:

eugene

Message:

install dsdbh.pm for working build, add example user-level commands

Location:

branches/eam_branches/ipp-pstamp-20260421/DataStoreServer

Files:

• example/commands.sh (added)
• notes.txt (modified) (2 diffs)
• web/cgi (modified) (1 prop)
• web/cgi/Makefile.am (modified) (3 diffs)

branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/notes.txt

@@ -15 +15 @@
   This generates the tables needed by the datastore web pages and tools
 
+* choose a psbuild location:
+  # psconfig ipp-pstamp
+  * sets the build / install environment for code below which does not go into
+    the apache server cgi location
+
+* in psconfig, to install needed perl libraries:
+  # pscheckperl pstamp-ubuntu -build
+
 * in DataStoreServer, to install the apache CGI elements:
-  * ./autogen.sh --with-cgidir=/MY/DATASTORE/ds-cgi --with-dsroot=/MY/DATASTORE/dsroot
-  * make cgi
+  # ./autogen.sh --with-cgidir=/MY/DATASTORE/ds-cgi --with-dsroot=/MY/DATASTORE/dsroot
+  # make cgi
   * then edit /MY/DATASTORE/ds-cgi/dsshellconfig
     ** supply the perl path of the user built to support the datastore
@@ -45 +53 @@
 
 * Things needed in the user build by the apache server:
-  * dsdbh.pm in PERL
+  * dsdbh.pm (installed as part of DataStoreServer : make cgi)
+  * Devel::CheckLib
   * DBD/mysql.pm
+
+* Edit the ippconfig/site.config to point at the datastore:
+  * DS_DBSERVER     
+  * DS_DBNAME       
+  * DS_DBUSER       
+  * DS_DBPASSWORD   
+  * DATA_STORE_ROOT
 
 * Things installed as user tools:
   * dsreg
   * dsprodtool
-
-*
 
 ----------

branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/web/cgi/Makefile.am

@@ +1 @@
+
+installdir = $(libdir)
+
+install_files = dsdbh.pm
+
+install_SCRIPTS = $(install_files)
+
+ACLOCAL_AMFLAGS = -I m4
+
+cgi_config = dsshellconfig
+
 cgi_scripts = \
   dsindex.cgi \
@@ -5 +16 @@
   dsfsindex \
   dsprodindex \
-  dsrootindex \
-  dsshellconfig
+  dsrootindex
 
 dsroot_files = index.txt.template index.txt
 
-EXTRA_DIST = $(cgi_scripts) $(dsroot_files)
+EXTRA_DIST = $(cgi_scripts) $(cgi_config) $(dsroot_files)
 
 install-cgi:
@@ -29 +39 @@
           $(INSTALL_DATA) $$f $(DESTDIR)$(dsroot)/$$f; \
         done
-        @echo ""
-        @echo "datastore apache CGI code installation complete."
-        @echo "Now please edit $(DESTDIR)$(cgidir)/dsshellconfig"
-        @echo "and add the required settings."
-        @echo ""
+
+        @if test ! -f "$(DESTDIR)$(cgidir)/dsshellconfig"; then \
+          $(INSTALL_DATA) dsshellconfig "$(DESTDIR)$(cgidir)/dsshellconfig"; \
+          echo ""; \
+          echo "Installed new dsshellconfig file:"; \
+          echo "  $(DESTDIR)$(cgidir)/dsshellconfig"; \
+          echo "Please edit it and add the required settings."; \
+          echo ""; \
+        else \
+          echo ""; \
+          echo "Preserving existing file:"; \
+          echo "  $(DESTDIR)$(DESTDIR)$(cgidir)/dsshellconfig"; \
+          echo "Template not reinstalled, so local edits were kept."; \
+          echo ""; \
+        fi
 
 uninstall-cgi: