Changeset 34453 for main/trunk/model-sites-dev/atea/collect

Timestamp:

2020-10-13T17:24:34+13:00 (4 years ago)

Author:

davidb

Message:

ex.Title now set based on escaped URL filename

Location:

main/trunk/model-sites-dev/atea/collect/digital-nz

Files:

• perllib/plugins/DNZJSONPlugin.pm (modified) (4 diffs)
• prepare/dnz-search-language-mi--python3.py (modified) (2 diffs)

main/trunk/model-sites-dev/atea/collect/digital-nz/perllib/plugins/DNZJSONPlugin.pm

@@ -122 +122 @@
 }
 
+sub dnz_add_utf8_metadata_title
+{
+    my $self = shift (@_);
+    my ($doc_obj,$section,$md_val) = @_;
+
+    $md_val =~ s/~COLON~/\:/g;
+    $md_val =~ s/~SLASH~/\//g;
+    $md_val =~ s/~DOT~/\./g;
+
+    $md_val =~ s/\.json$//;
+    
+    $doc_obj->add_utf8_metadata($section, "Title", $md_val);
+   
+}
+
 sub process
 {
@@ -142 +157 @@
         if (defined $md_val && ($md_val ne "")) {
             $doc_obj->add_utf8_metadata($section, "dnz.$k", $md_val);
+            # $self->dnz_add_utf8_metadata($doc_obj,$section, $k, $md_val);
         }
         }
@@ -149 +165 @@
         if (defined $md_val && ($md_val ne "")) {
             $doc_obj->add_utf8_metadata($section, "dnz.$k", $md_val);
+            # $self->dnz_add_utf8_metadata($doc_obj,$section, $k, $md_val);
         }
     }
@@ -154 +171 @@
     }
 
-
+    my $source = $doc_obj->get_metadata_element($section,"Source");
+    $self->dnz_add_utf8_metadata_title($doc_obj,$section, $source);
+    
     # Record was processed successfully
     return 1;

main/trunk/model-sites-dev/atea/collect/digital-nz/prepare/dnz-search-language-mi--python3.py

@@ -15 +15 @@
 # DNZ key
 DNZ = dnz.api.Dnz('<CHANGEME>')
-
 
 #result = dnz.search('kiwi tui')
@@ -41 +40 @@
         #json_landing_filename = re.sub('[:/.]', '-', landing_url) + ".json"
 
-        json_landing_filename1 = re.sub('[:]', '-', landing_url)
-        json_landing_filename2 = re.sub('[/]', '|', json_landing_filename1)
-        json_landing_filename  = re.sub('[.]', '_', json_landing_filename2) + ".json"
+        json_landing_filename1 = re.sub('[:]', '~COLON~', landing_url)
+        json_landing_filename2 = re.sub('[/]', '~SLASH~', json_landing_filename1)
+        json_landing_filename  = re.sub('[.]', '~DOT~', json_landing_filename2) + ".json"
                 
         full_json_landing_filename = "import/" + json_landing_filename