Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions dspace/bin/etd2marc-mail

This file was deleted.

10 changes: 0 additions & 10 deletions dspace/bin/etd2marc-transfer

This file was deleted.

16 changes: 2 additions & 14 deletions dspace/bin/load-etd
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ chomp($bindir = `dirname $0`);
$ENV{UMD_DSPACE_CLI_LOG_CONFIG} = "-Dlog4j2.configurationFile=log4j2-etdloader.xml";
$ENV{JAVA_OPTS} .= " -Ddspace.log.init.disable=true";
$ENV{JAVA_OPTS} .= " -Detdloader.zipfile=$zipfile";
$ENV{JAVA_OPTS} .= " -Detdloader.marcfile=$marcfile" if (defined $marcfile);
$ENV{JAVA_OPTS} .= " -Detdloader.singleitem=$item" if (defined $item);
$ENV{JAVA_OPTS} .= " -Detdloader.csvfile=$csvfile" if (defined $csvfile);

# Add additions jar to front of classpath to ensure the overlay files
# has precedence over stock implementation
Expand Down Expand Up @@ -62,7 +60,7 @@ sub GetCmdLine {
PrintUsageAndExit();
}

if ( ! getopts('i:o:r:c:')) {
if ( ! getopts('i:r:')) {
print "Error in option processing\n\n";
PrintUsageAndExit();
}
Expand All @@ -72,18 +70,10 @@ sub GetCmdLine {
}
$zipfile = $opt_i;

if (defined $opt_o) {
$marcfile = $opt_o;
}

if (defined $opt_r) {
$item = $opt_r;
}

if (defined $opt_c) {
$csvfile = $opt_c;
}

}


Expand All @@ -101,11 +91,9 @@ sub PrintUsageAndExit {
}

print <<'EOS';
Usage: load-etd -i <zipfile> [-o <marcfile>] [-r <item>] [-c <csvfile>]
Usage: load-etd -i <zipfile> [-r <item>]
<zipfile>: zip file containing items to load
<marcfile>: output marc file
<item>: process a single item, not the entire zip file
<csvfile>: CSV output file with author,title,handle of each item
EOS

exit 1;
Expand Down
42 changes: 5 additions & 37 deletions dspace/bin/load-etd-nightly
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/csh

# load-etd-nightly
#
#
# Check for new upload files in the incoming directory and load
# them into dspace.
#
Expand All @@ -17,37 +17,22 @@ set datadir = `cd $argv[1]; pwd`
set bindir = `dirname $0`
set incomingdir = $datadir/incoming
set processeddir = $datadir/processed
set marcdir = $datadir/marc
set marcfile = `date '+%Y%m%d'`.dat
set csvdir = $datadir/csv
set csvfile = `date '+%Y%m%d'`.csv
set transfermarc = `$bindir/dspace dsprop -property etdloader.transfermarc`;

# Check for incoming files
ls $incomingdir/etdadmin_upload_*.zip >& /dev/null
if ($status == 0) then
echo Files found in $incomingdir

if (! -d $marcdir ) then
mkdir -p $marcdir
endif
if (! -d $csvdir ) then
mkdir -p $csvdir
endif

touch $marcdir/$marcfile
touch $csvdir/$csvfile

@ count = 0

foreach upload ($incomingdir/etdadmin_upload_*.zip)
set zipfile = `basename $upload`

# Load the files from this archive
echo
# Load the files from this archive
echo
echo ======================================================================
echo Loading archive file: $incomingdir/$zipfile
$bindir/load-etd -i $incomingdir/$zipfile -o $marcdir/$marcfile -c $csvdir/$csvfile
echo Loading archive file: $incomingdir/$zipfile
$bindir/load-etd -i $incomingdir/$zipfile

# Move archive to the processed directory
if (! -d $processeddir ) then
Expand All @@ -59,23 +44,6 @@ if ($status == 0) then

@ count = $count + 1
end

# Marc processing
if ($count > 0) then
if ($transfermarc == "true") then
echo
echo ======================================================================
echo Transfering marc file
cd $marcdir
$bindir/etd2marc-transfer $marcfile

echo
echo Sending email notification
$bindir/etd2marc-mail $count $marcfile
else
echo Upload of the marc file is not enabled
endif
endif
endif


Expand Down
200 changes: 0 additions & 200 deletions dspace/config/load/etd2marc.xsl

This file was deleted.

1 change: 0 additions & 1 deletion dspace/config/local.cfg.EXAMPLE
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ drum.mail.duplicate_title = mohideen@umd.edu
drum.eperson.subscription.limiteperson =

# Used by etd loader cron job
drum.etdloader.transfermarc = false
drum.etdloader.eperson = load_diss@drum.umd.edu
# UUID of "UMD Theses and Dissertations" collection
drum.etdloader.collection = ba3ddc3f-7a58-4fd3-bde5-304938050ea2
Expand Down
Loading