rda-python-dsarch 1.0.9__tar.gz → 1.0.12__tar.gz

{rda_python_dsarch-1.0.9 → rda_python_dsarch-1.0.12}/MANIFEST.in

@@ -1,2 +1 @@
 include src/rda_python_dsarch/dsarch.usg
-include src/rda_python_dsarch/dsarch.c

{rda_python_dsarch-1.0.9 → rda_python_dsarch-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 1.0.9
+Version: 1.0.12
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch
@@ -12,5 +12,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rda_python_common
+Requires-Dist: rda_python_setuid
+Dynamic: license-file
 
 RDA python Package to archive and maintain RDA datasets.

{rda_python_dsarch-1.0.9 → rda_python_dsarch-1.0.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dsarch"
-version = "1.0.9"
+version = "1.0.12"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]
@@ -19,6 +19,7 @@ classifiers = [
 ]
 dependencies = [
   "rda_python_common",
+  "rda_python_setuid",
 ]
 
 [tool.setuptools]
@@ -28,7 +29,7 @@ include-package-data = true
 where = ["src"]
 
 [tool.setuptools.package-data]
-"rda_python_dsarch" = ["dsarch.usg", "dsarch.c"]
+"rda_python_dsarch" = ["dsarch.usg"]
 
 [project.urls]
 "Homepage" = "https://github.com/NCAR/rda-python-dsarch"

{rda_python_dsarch-1.0.9 → rda_python_dsarch-1.0.12}/src/rda_python_dsarch/dsarch.py

@@ -42,7 +42,7 @@ ERRMSG = ''
 def main():
 
    pgname = "dsarch"
-   PgLOG.PGLOG['PUSGDIR'] = op.dirname(op.abspath(__file__))
+   PgLOG.set_help_path(__file__)
    PgOPT.parsing_input(pgname)
    PgLOG.set_suid(PgLOG.PGLOG['EUID'] if PgOPT.OPTS[PgOPT.PGOPT['CACT']][2] > 0 else PgLOG.PGLOG['RUID'])
    
@@ -2491,7 +2491,7 @@ def set_for_internal_group(gindex):
    gcnd = "gindex = {} AND status = 'P'".format(gindex)
    cnd = "{} AND {}".format(dcnd, gcnd)
 
-   pgrecs = PgSplit.pgget_wfile(dsid, 'wfile, type', gcnd, PgOPT.PGOPT['extlog'])
+   pgrecs = PgSplit.pgmget_wfile(dsid, 'wfile, type', gcnd, PgOPT.PGOPT['extlog'])
    cnt = len(pgrecs['wfile']) if pgrecs else 0
    srec = {'status' : 'I'}
    if cnt:
@@ -2840,7 +2840,7 @@ def set_one_webfile(i, pgrec, file, flds, type, info = None, ndsid = None, sact
    record = PgOPT.build_record(flds, pgrec, tname, i)
    if pgrec and (pgrec['status'] == 'D' or PgOPT.PGOPT['ACTS']&PgOPT.OPTS['AW'][0]):
       record['uid'] = PgOPT.PGOPT['UID']
-      if not info:
+      if not (info and info['date_modified']):
          info = PgFile.check_local_file(PgArch.get_web_path(i, file, 1, type),
                                         1, PgOPT.PGOPT['emerol'])
       if info:
@@ -2992,7 +2992,7 @@ def set_one_helpfile(i, pgrec, file, flds, type, info = None, ndsid = None):
    record = PgOPT.build_record(flds, pgrec, tname, i)
    if pgrec and (pgrec['status'] == 'D' or PgOPT.PGOPT['ACTS']&PgOPT.OPTS['AH'][0]):
       record['uid'] = PgOPT.PGOPT['UID']
-      if not info:
+      if not (info and info['date_modified']):
          info = PgFile.check_local_file(PgArch.get_help_path(i, file, 1, type), 1, PgOPT.PGOPT['emerol'])
       if info:
          record['data_size'] = info['data_size']
@@ -3161,7 +3161,7 @@ def set_one_savedfile(i, pgrec, file, flds, type, info = None, ndsid = None, sac
    record = PgOPT.build_record(flds, pgrec, tname, i)
    if pgrec and PgOPT.PGOPT['ACTS']&PgOPT.OPTS['AS'][0]:
       record['uid'] = PgOPT.PGOPT['UID']
-      if not info:
+      if not (info and info['date_modified']):
          info = PgFile.check_local_file(PgArch.get_saved_path(i, file, 1, type), 1, PgOPT.PGOPT['emerol'])
       if info:
          record['data_size'] = info['data_size']

{rda_python_dsarch-1.0.9 → rda_python_dsarch-1.0.12}/src/rda_python_dsarch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 1.0.9
+Version: 1.0.12
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch
@@ -12,5 +12,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rda_python_common
+Requires-Dist: rda_python_setuid
+Dynamic: license-file
 
 RDA python Package to archive and maintain RDA datasets.

{rda_python_dsarch-1.0.9 → rda_python_dsarch-1.0.12}/src/rda_python_dsarch.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ pyproject.toml
 src/rda_python_dsarch/PgArch.py
 src/rda_python_dsarch/PgMeta.py
 src/rda_python_dsarch/__init__.py
-src/rda_python_dsarch/dsarch.c
 src/rda_python_dsarch/dsarch.py
 src/rda_python_dsarch/dsarch.usg
 src/rda_python_dsarch.egg-info/PKG-INFO

{rda_python_dsarch-1.0.9 → rda_python_dsarch-1.0.12}/src/rda_python_dsarch.egg-info/requires.txt

@@ -1 +1,2 @@
 rda_python_common
+rda_python_setuid

rda_python_dsarch-1.0.9/src/rda_python_dsarch/dsarch.c

@@ -1,41 +0,0 @@
-/***************************************************************************************\
- *
- *    Title: dsarch.c
- *   Author: Zaihua Ji, zji@ucar.edu
- *     Date: 2024-01-30
- *  Purpose: C wrapper to setuid for a common effective user to
- *           run dsarch python scripts
- *
- * Instruction:
- *    after python -m pip install rda_python_dsarch
- *    cd $ENVHOME/lib/python3.*/site-packages/rda_python_dsarch/
- *    cp dsarch.c $ENVHOME/bin/
- *    cd $ENVHOME/bin/
- *    sudo -u CommonUser gcc -o dsarch $ENVHOME/bin/dsarch.c
- *    sudo -u CommonUser chmod 4750 dsarch
- *
- *           *: python 3 release number, for example n = 10 in Python 3.10.12
- *  CommonUser: rdadata, for RDAMS configuration
- *    $ENVHOME: /glade/u/home/rdadata/rdamsenv (venv) on DECS machines, and
- *              /glade/work/rdadata/conda-envs/pg-rda (conda) on DAV;
- *
- \***************************************************************************************/
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libgen.h>
-
-/* main program */
-int main(int argc, char *argv[]) {
-   char prog[128];
-   char file[] = __FILE__;
-
-   strcpy(prog, dirname(file));
-   strcat(prog, "/dsarch.py");
-
-   /* call Python script */
-   execv(prog, argv);
-}