Merge pull request iodepo#112 from jmckenna/name-list

[Indexer] Handle name as a List, and handle type:Movie
jmckenna · Nov 30, 2023 · 2f93f72 · 2f93f72
2 parents 7f41299 + 7ba1cb5
commit 2f93f72
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/indexer/indexer.py b/indexer/indexer.py
@@ -151,9 +151,9 @@ def genericType_toAtts(orig, rid=None):
         if orig['@type'] == 'Project' or orig['@type'] == 'ResearchProject':
           print('***changing type:Project to type:ResearchProject')
           origType = 'ResearchProject'
-        #handle type:DigitalDocument as type:CreativeWork (see https://github.com/iodepo/odis-arch/issues/337 )
-        elif orig['@type'] == 'CreativeWork' or orig['@type'] == 'DigitalDocument':
-          print('***changing type:DigitalDocument to type:CreativeWork')
+        #handle CreativeWork subsets as type:CreativeWork (see https://github.com/iodepo/odis-arch/issues/337 )
+        elif orig['@type'] == 'CreativeWork' or orig['@type'] == 'DigitalDocument' or orig['@type'] == 'Movie':
+          print('***changing type:' + orig['@type'] + ' to type:CreativeWork')
           origType = 'CreativeWork'
         else:
           origType = orig['@type']                
@@ -185,14 +185,18 @@ def genericType_toAtts(orig, rid=None):
                     #handle case of name as list
                     for i in v:
                         pos = 0
-                        print(i.values()) 
-                        for val in i.values():
-                            if val == "en":
-                                listForm = list(i.values())
-                                print('***Name: ' + listForm[pos+1])
-                                data.append(Att(None, listForm[pos+1], k))
-                                data.append(Att('txt', listForm[pos+1], k))
-                                data.append(Att('txt', regions.regionForName(listForm[pos+1]), 'region'))
+                        if isinstance(i, dict) == True:
+                            print(i.values()) 
+                            for val in i.values():
+                                if val == "en":
+                                    listForm = list(i.values())
+                                    print('***Name: ' + listForm[pos+1])
+                                    data.append(Att(None, listForm[pos+1], k))
+                                    data.append(Att('txt', listForm[pos+1], k))
+                                    data.append(Att('txt', regions.regionForName(listForm[pos+1]), 'region'))
+                        else:
+                            data.append(Att(None, i, k))
+                            data.append(Att('txt', i, k))                                    
             elif k == 'description':
                 if isinstance(v, list) == False:
                     #print('type is: ',type(v))