Changeset 1384 for fmts/trunk

Timestamp:

Mar 23, 2012, 12:34:28 PM (13 years ago)

Author:

George Lilly

Message:

fixed nodeID rdf processing

Location:

fmts/trunk/p

Files:

• C0XF2N.m (modified) (3 diffs)
• C0XRDF.m (modified) (1 diff)

fmts/trunk/p/C0XF2N.m

@@ -142 +142 @@
  S BATMAX=10000 ; TRY BATCHES OF THIS SIZE
  N ZGRAPH,ZSUBJECT
- S ZGRAPH="_:G"_$$LKY5 ; RANDOM GRAPH NAME
+ S ZGRAPH="_:G"_$$LKY9 ; RANDOM GRAPH NAME
  S ZSUBJECT=$$ANONS() ; RANDOM ANOYMOUS SUBJECT
  D ADD(ZGRAPH,ZSUBJECT,"fmts:url",ZNAME,FARY)
  N ZTXTNM
- S ZTXTNM="_TXT_INCOMING_RDF_FILE_"_ZNAME_"_"_$$LKY5 ; NAME FOR TEXT NODE
+ S ZTXTNM="_TXT_INCOMING_RDF_FILE_"_ZNAME_"_"_$$LKY9 ; NAME FOR TEXT NODE
  D ADD(ZGRAPH,ZSUBJECT,"fmts:fileSource",ZTXTNM,FARY)
  D ADD(ZGRAPH,ZSUBJECT,"fmts:fileTag",$$name2tag(ZNAME),FARY)
@@ -259 +259 @@
  ; -- populate the metagraph to point to the graph with status unfinished
  S METAS=$$ANONS ; GET AN ANONOMOUS RANDOM SUBJECT
- I '$D(ZMETA) S ZMETA="_:G"_$$LKY5 ; RANDOM GRAPH NAME FOR METAGRAPH
+ I '$D(ZMETA) S ZMETA="_:G"_$$LKY9 ; RANDOM GRAPH NAME FOR METAGRAPH
  D ADD(ZMETA,METAS,"fmts:about",ZGRF,FARY) ; POINT THE META TO THE GRAPH
  D ADD(ZMETA,METAS,"fmts:status","unfinished",FARY) ; mark as unfinished
@@ -377 +377 @@
  ;
 ANONS() ; RETURNS AN ANONOMOUS SUBJECT
- Q "iDPsDPss"_$$LKY5
+ Q "iDPsDPss"_$$LKY9
  ;
 NEWG(NGRAPH,NMETA) ; CREATES A NEW META GRAPH, MARKS IT AS UNFINISHED
  ; THEN CREATES A NEW GRAPH AND POINTS THE METAGRAPH TO IT
  ; NGRAPH AND NMETA ARE PASSED BY REFERENCE AND ARE THE RETURN
- S NGRAPH="G"_$$LKY5
+ S NGRAPH="G"_$$LKY9
  S NMETA=NGRAPH_"A"
  Q

fmts/trunk/p/C0XRDF.m

@@ -44 +44 @@
  . S ZB=$P(ZPRED,":",2)
  . S ZC=C0XVOC(ZA)
+ . I ZOBJ["nodeID:" D  Q  ;
+ . . D ADD(ZARY,"<"_ZB_" xmlns="""_ZC_""" rdf:nodeID="""_$$EXT^C0XUTIL(ZOBJ)_"""/>")
  . D ADD(ZARY,"<"_ZB_" xmlns="""_ZC_""">"_$$EXT^C0XUTIL(ZOBJ)_"</"_ZB_">")
  Q