Merge pull request #1448 from linas/atomese-misc

Atomese misc changes
opencog · Feb 21, 2023 · 01b836d · 01b836d
2 parents f78377e + ada28c5
commit 01b836d
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 14 deletions.
diff --git a/link-grammar/dict-atomese/link-names.cc b/link-grammar/dict-atomese/link-names.cc
@@ -8,9 +8,8 @@
 #ifdef HAVE_ATOMESE
 
 #include <cstdlib>
-//#include <opencog/util/oc_assert.h>
+#include <opencog/atoms/truthvalue/CountTruthValue.h>
 #include <opencog/atomspace/AtomSpace.h>
-//#include <opencog/persist/api/StorageNode.h>
 #include <opencog/nlp/types/atom_types.h>
 
 #undef STRINGIFY
@@ -104,11 +103,43 @@ std::string cached_linkname(Local* local, const Handle& lnk)
 
 	// idtostr(1064) is "ANY" and we want to reserve "ANY"
 	if (1064 == local->last_id) local->last_id++;
-	std::string slnk = idtostr(local->last_id++);
+	store_link_id(local);
 
+	std::string slnk = idtostr(local->last_id++);
 	lgc = createNode(BOND_NODE, slnk);
 	local->asp->add_link(EDGE_LINK, lgc, lnk);
 	return slnk;
 }
 
+// ===============================================================
+
+// Get the last issued link ID from the data store.
+void fetch_link_id(Local* local)
+{
+	if (not local->using_external_as) return;
+
+	// Location where issued link ID's are stored.
+	if (local->stnp)
+		local->stnp->fetch_atom(local->idanch);
+
+	const TruthValuePtr& tv = local->idanch->getTruthValue();
+	const CountTruthValuePtr ctv(CountTruthValueCast(tv));
+	if (ctv)
+		local->last_id = std::round(ctv->get_count());
+}
+
+// Record the last unissued id.
+void store_link_id(Local* local)
+{
+	if (not local->using_external_as) return;
+
+	TruthValuePtr tvp(createCountTruthValue(1, 0, local->last_id));
+	local->asp->set_truthvalue(local->idanch, tvp);
+
+	// Store, if there is storage.
+	if (local->stnp)
+		local->stnp->store_atom(local->idanch);
+}
+
+// ===============================================================
 #endif /* HAVE_ATOMESE */
diff --git a/link-grammar/dict-atomese/local-as.h b/link-grammar/dict-atomese/local-as.h
@@ -80,5 +80,8 @@ void and_enchain_right(Pool_desc*, Exp* &orhead, Exp* &ortail, Exp*);
 
 Handle get_lg_conn(Local*, const Handle& pair);
 std::string cached_linkname(Local*, const Handle& pair);
+void fetch_link_id(Local*);
+void store_link_id(Local*);
+
 
 //----
diff --git a/link-grammar/dict-atomese/lookup-atomese.cc b/link-grammar/dict-atomese/lookup-atomese.cc
@@ -9,7 +9,6 @@
 
 #include <cstdlib>
 #include <opencog/atomspace/AtomSpace.h>
-#include <opencog/atoms/truthvalue/CountTruthValue.h>
 #include <opencog/persist/api/StorageNode.h>
 #include <opencog/persist/cog-simple/CogSimpleStorage.h>
 #include <opencog/persist/cog-storage/CogStorage.h>
@@ -330,12 +329,8 @@ bool as_open(Dictionary dict)
 		local->stnp->barrier();
 	}
 
-	// Used to hold issued link ID's.
-	local->stnp->fetch_atom(local->idanch);
-	const TruthValuePtr& tv = local->idanch->getTruthValue();
-	const CountTruthValuePtr ctv(CountTruthValueCast(tv));
-	if (ctv)
-		local->last_id = std::round(ctv->get_count());
+	// Get last issued link ID.
+	fetch_link_id(local);
 
 	return true;
 }
@@ -352,10 +347,7 @@ void as_storage_close(Dictionary dict)
 	Local* local = (Local*) (dict->as_server);
 
 	// Record the last unissued id.
-	TruthValuePtr tvp(createCountTruthValue(1, 0, local->last_id));
-	local->asp->set_truthvalue(local->idanch, tvp);
-	if (local->stnp)
-		local->stnp->store_atom(local->idanch);
+	store_link_id(local);
 
 	if (not local->using_external_as and local->stnp)
 		local->stnp->close();