Merge pull request #271 from rice-crc/develop

Merge develop into main

Author: derekjkeller

src/api/common/reqs.py

@@ -205,11 +205,12 @@ def post_req(orig_queryset,s,r,options_dict,auto_prefetch=True,paginate=False):
 					# so we filter on each chunk of the name, serially, stripped of punctuation
 					qobjstrs=[]
 					for namesegment in namesegments:
-						qobjstr=f'Q(voyage_enslavement_relations__relation_enslavers__enslaver_alias__alias__icontains="{namesegment}")'
+						qobjstr=f'Q(voyage_enslavement_relations__relation_enslavers__enslaver_alias__alias__icontains="{namesegment}")|\
+								Q(voyage_enslavement_relations__relation_enslavers__enslaver_alias__identity__principal_alias__icontains="{namesegment}")'
 						qobjstrs.append(qobjstr)
 					qobjstr=' , '.join(qobjstrs)
 					execobjstr=f'filtered_queryset.filter({qobjstr})'
-# 					print("EXECOBJSTR",execobjstr)
+					print("EXECOBJSTR",execobjstr)
 					enslavernamehits=eval(execobjstr)
 # 					print("enslavernamehits",enslavernamehits)
 # 					print("enslavernamehitscount",enslavernamehits.count())
@@ -222,7 +223,7 @@ def post_req(orig_queryset,s,r,options_dict,auto_prefetch=True,paginate=False):
 							eirs_unfiltered=er.relation_enslavers.all()
 							qobjstrs=[]
 							for namesegment in namesegments:
-								qobjstr=f'Q(enslaver_alias__alias__icontains="{namesegment}")'
+								qobjstr=f'Q(enslaver_alias__alias__icontains="{namesegment}")|Q(enslaver_alias__identity__principal_alias__icontains="{namesegment}")'
 # 								print("--->",qobjstr)
 								qobjstrs.append(qobjstr)
 							qobjstr=' , '.join(qobjstrs)

src/api/document/management/commands/texas_import_2.py

@@ -70,12 +70,14 @@ def handle(self, *args, **options):
 						except:
 							pass
 
-		EnslaverAlias.objects.all().filter(
+		texas_enslaver_aliases=EnslaverAlias.objects.all().filter(
 			manual_id__icontains='TEXAS_ENSLAVER'
-		).delete()
-				
-				
-							
+		)
+		
+		for tea in texas_enslaver_aliases:
+			tea.identity.delete()
+			tea.delete()
+			
 		# 1. Run through the two spreadsheets
 		# 	A. & create new enslaver identities off each unique name, keeping an alias id for each
 		# 		1. texas_voyage_enslavers:
@@ -122,18 +124,22 @@ def handle(self, *args, **options):
 
 				identity,identity_isnew=EnslaverIdentity.objects.get_or_create(
 					principal_alias=enslaver_name,
-# 					manual_id=texas_id
 				)
 
 
-# 				if vid=='135509':
-# 					print("AAA",enslaver_name)
-				
-				alias,alias_isnew=EnslaverAlias.objects.get_or_create(
+				aliases=EnslaverAlias.objects.filter(
 					alias=enslaver_name,
 					identity=identity
 				)
 
+				if len(aliases)==0:
+					alias=EnslaverAlias.objects.create(
+						alias=enslaver_name,
+						identity=identity
+					)
+				else:
+					alias=aliases[0]
+								
 				alias.manual_id=texas_id
 				alias.save()
 

src/api/voyages3/settings.py

@@ -194,8 +194,8 @@
 site = FileBrowserSite(name='filebrowser')
 
 site.storage.location = "static"
-site.directory="uploads/"
-site.storage.base_url = "/abcdefg"
+site.directory="static/uploads/"
+site.storage.base_url = "/static/uploads"
 
 TINYMCE_JS_URL="tinymce/tinymce.min.js"
 TINYMCE_DEFAULT_CONFIG = {

src/people-networks/utils.py

@@ -242,6 +242,9 @@ def load_graph():
 				else:
 					if len(voyage_uuids)>1:
 						print("more voyages than we counted on",rc)
+					elif len(voyage_uuids)==0:
+						pass
+# 						print(relations_dict)
 					else:
 						voyage_uuid=voyage_uuids[0]
 						# if we have a single voyage, then we know that we're dealing with