Attachment 93550 Details for Bug 21903 – Bug 21903: koha-dump can export uploaded and temporary uploaded files

[patch] Bug 21903: koha-dump can export uploaded and temporary uploaded files

Bug-21903-koha-dump-can-export-uploaded-and-tempor.patch (text/plain), 3.63 KB, created by Matthias Meusburger on 2019-10-03 10:02:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Meusburger

Created: 2019-10-03 10:02:06 UTC

Size: 3.63 KB

patch

obsolete

>From 6cf450f56e83cc1609162e9119ccb4814122a492 Mon Sep 17 00:00:00 2001
>From: Matthias Meusburger <matthias.meusburger@biblibre.com>
>Date: Wed, 10 Apr 2019 11:38:45 +0200
>Subject: [PATCH] Bug 21903: koha-dump can export uploaded and temporary
> uploaded files
>
>Sponsored-by: Orex
>
>Test plan:
> - Apply the patch
> - Try using koha-dump without any option
> - Try using koha-dump with --uploaded_files
> - Try using koha-dump with --uploaded_temp_files
> - Try using koha-dump with both of the options above
>
>Expected results: the .tar.gz dump will include uploaded and/or temporary
>uploaded files if requested.
>---
> debian/scripts/koha-dump         | 26 ++++++++++++++++++++++++--
> debian/scripts/koha-functions.sh | 20 ++++++++++++++++++++
> 2 files changed, 44 insertions(+), 2 deletions(-)
>
>diff --git a/debian/scripts/koha-dump b/debian/scripts/koha-dump
>index 3749472127..877b3cffb3 100755
>--- a/debian/scripts/koha-dump
>+++ b/debian/scripts/koha-dump
>@@ -44,6 +44,8 @@ $scriptname [--quiet|-q] [--exclude-indexes] instancename1 [instancename2...]
> $scriptname -h|--help
> 
>     --exclude-indexes     Include Zebra indexes on the backup.
>+    --uploaded_files      Include uploaded files.
>+    --uploaded_temp_files Include temporary uploaded files.
>     --quiet|-q            Make the script avoid printing to STDOUT
>                           (useful for calling from another scripts).
>     --help|-h             Display this help message
>@@ -79,19 +81,33 @@ dump_instance()
> 
>     # Dump configs, logs, etc.
>     metadump="$backupdir/$name-$date.tar.gz"
>-    [ "$quiet" = "no" ] && echo "* configs, logs to $metadump"
>+    [ "$quiet" = "no" ] && echo "* configs, files, logs to $metadump"
> 
>     if [ "$exclude_indexes" = "yes" ]; then
>         excludes="--exclude=var/lib/koha/$name/biblios \
>                   --exclude=var/lib/koha/$name/authorities"
>     fi
> 
>+    if [ "$uploaded_files" = "yes" ]; then
>+        # Remove leading /
>+        uploaded_files_dir=$(echo $(get_upload_path $name) | cut -c 2-)
>+    fi
>+
>+    if [ "$uploaded_temp_files" = "yes" ]; then
>+        # Remove leading /
>+        tempdir=$(echo $(get_tmp_path $name) | cut -c 2-)
>+        uploaded_temp_files_dir="$tempdir/koha_${name}_upload"
>+    fi
>+
>     tar -czf "$metadump" -C / $excludes \
>         "etc/koha/sites/$name" \
>         "etc/apache2/sites-available/$instancefile" \
>         "etc/apache2/sites-enabled/$instancefile" \
>         "var/lib/koha/$name" \
>-        "var/log/koha/$name"
>+        "var/log/koha/$name" \
>+        $uploaded_files_dir \
>+        $uploaded_temp_files_dir
>+
> 
>     [ "$quiet" = "no" ] && echo "Done."
> }
>@@ -106,6 +122,12 @@ while [ $# -gt 0 ]; do
>         --exclude-indexes)
>             exclude_indexes="yes"
>             shift ;;
>+       --uploaded_files)
>+            uploaded_files="yes"
>+            shift ;;
>+        --uploaded_temp_files)
>+            uploaded_temp_files="yes"
>+            shift ;;
>         -h|--help)
>             usage ; exit 0 ;;
>         -q|--quiet)
>diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh
>index 899feba5fe..af4d7c953a 100755
>--- a/debian/scripts/koha-functions.sh
>+++ b/debian/scripts/koha-functions.sh
>@@ -325,6 +325,26 @@ get_max_record_size()
>     fi
> }
> 
>+get_tmp_path()
>+{
>+    local instancename=$1
>+    local retval=$(run_safe_xmlstarlet $instancename tmp_path)
>+    if [ "$retval" != "" ]; then
>+        echo "$retval"
>+        return 0
>+    fi
>+}
>+
>+get_upload_path()
>+{
>+    local instancename=$1
>+    local retval=$(run_safe_xmlstarlet $instancename upload_path)
>+    if [ "$retval" != "" ]; then
>+        echo "$retval"
>+        return 0
>+    fi
>+}
>+
> get_tmpdir()
> {
>     if [ "$TMPDIR" != "" ]; then
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21903: 88598 | 88867 | 93550 | 93862 | 126835 | 126907 | 126908 | 128732 | 134349 | 134350 | 134351