vocab additions, extra param for info script

Author: azaroth42

cromulent/vocab.py

@@ -75,6 +75,8 @@ def register_instance(name, data):
 	"DoiIdentifier": {"parent": Identifier, "id": "300417432", "label": "DOI Identifer"},
 	"VolumeNumber": {"parent": Identifier, "id": "300265632", "label": "Volume"},
 	"IssueNumber": {"parent": Identifier, "id": "300312349", "label": "Issue"},
+	"CallNumber": {"parent": Identifier, "id": "300311706", "label": "Call Number"},
+
 
 	"EmailAddress": {"parent": Identifier, "id":"300435686", "label": "Email Address"},
 	"StreetAddress": {"parent": Identifier, "id":"300435687", "label": "Street Address"},
@@ -107,6 +109,7 @@ def register_instance(name, data):
 	"ContextStatement": {"parent": LinguisticObject, "id": "300435428", "label": "Historical/Cultural Context", "metatype": "brief text"},
 	"SourceStatement": {"parent": LinguisticObject, "id": "300404764", "label": "Source Statement", "metatype": "brief text"},
 	"PropertyStatusStatement": {"parent": LinguisticObject, "id": "300438433", "label": "Property Status Statement", "metatype": "brief text"},
+	"AccessStatement": {"parent": LinguisticObject, "id": "300133046", "label": "Access Statement", "metatype": "brief text"},
 
 	"MarkingsStatement": {"parent": LinguisticObject, "id": "300435420", "label": "Markings", "metatype": "brief text"},
 	"InscriptionStatement": {"parent": LinguisticObject, "id": "300435414", "label": "Inscription", "metatype": "brief text"},

utils/info.py

@@ -6,6 +6,7 @@
 parser.add_argument('what')
 parser.add_argument('--okay', '--profile', dest="okay", type=bool)
 parser.add_argument('--filter', dest="filter")
+parser.add_argument('--self', dest="onlySelf", type=bool)
 args = parser.parse_args()
 
 def list_all_props(what, filter=None, okay=None):
@@ -22,6 +23,19 @@ def list_all_props(what, filter=None, okay=None):
 	props.sort(key=lambda x: x.property)
 	return props
 
+def list_my_props(what, filter=None, okay=None):
+	props = []
+	ks = []
+	for k,v in what._all_properties.items():
+		if not k in ks and \
+			(not okay or (okay and v.profile_okay)) and \
+			(filter is None or isinstance(filter, v.range) or \
+				filter is v.range):
+			props.append(v)
+			ks.append(k)
+	props.sort(key=lambda x: x.property)
+	return props
+
 what = args.what
 try:
 	c = getattr(model, what)
@@ -50,10 +64,17 @@ def list_all_props(what, filter=None, okay=None):
 	print("Filtered To: None")
 print(f"Using Profile: {args.okay}")
 
+
+
+model.factory.validate_profile = False
 instance = c()
-ap = list_all_props(instance, okay=args.okay, filter=f)
 
-ap2 = instance.list_all_props(okay=args.okay, filter=f)
+if args.onlySelf:
+	ap = list_my_props(instance, okay=args.okay, filter=f)
+else:
+	ap = list_all_props(instance, okay=args.okay, filter=f)
+
+#ap2 = instance.list_all_props(okay=args.okay, filter=f)
 
 
 for pi in ap: