Changeset 1391

Timestamp:

Apr 4, 2012, 2:45:35 PM (12 years ago)

Author:

George Lilly

Message:

added support for raw mumps array format

Location:

fmts/trunk/p

Files:

• C0XGET1.m (modified) (4 diffs)
• C0XRDF.m (modified) (1 diff)

fmts/trunk/p/C0XGET1.m

@@ -109 +109 @@
  ;
 getGraph(zrtn,zgrf,form) ; get all triples in graph zgrf
- ; forms planned: "rdf" "json" "array" "turtle" "triples"
- ; forms supported: "rdf" "json" "array"
+ ; forms planned: "rdf" "json" "array" "turtle" "triples" "raw"
+ ; forms supported: "rdf" "json" "array" "raw"
  I '$D(form) S form="rdf"
  N ZIENS,ZTRIP
@@ -119 +119 @@
  i form="rdf" d rdfout^C0XRDF(.zrtn,.ZTRIP) q  ;
  i form="array" d arrayout^C0XGET1(.zrtn,.ZTRIP) q  ;
+ i form="raw" d rawout^C0XGET1(.zrtn,.ZTRIP) q  ;
  W !,"Form not supported: ",form
  Q
@@ -157 +158 @@
  i form="json" d jsonout(.triplertn,.zrary) q  ; what follows is 'else'
  i form="rdf" d rdfout^C0XRDF(.triplertn,.zrary) q  ;
- i form="array" d arrayout(.triplertn,.zrary) q ;
+ i form="array" d arrayout(.triplertn,.zrary) q  ;
+ i form="raw" d rawout(.triplertn,.zrary) q  ;
  w !,"form not supported: ",form 
  q
@@ -283 +285 @@
  q
  ;
+rawout(rtn,zary) ; output a mumps array of triples
+ ;
+ s zrsub=""
+ ;s zcnt=1
+ f  s zrsub=$o(zary(zrsub)) q:zrsub=""  d  ; organized by subject
+ . s zzz=""
+ . f  s zzz=$o(zary(zrsub,zzz)) q:zzz=""  d  ; pred and obj
+ . . s rtn(zrsub,$p(zzz,"^",1))=$p(zzz,"^",2)
+ . . ;s zcnt=zcnt+1
+ q
+ ;
 strings(zrary,zinary) ; convert pointers to strings
  ;

fmts/trunk/p/C0XRDF.m

@@ -43 +43 @@
  . S ZA=$P(ZPRED,":",1)
  . S ZB=$P(ZPRED,":",2)
+ . I $E(ZB,1,1)="/" D  ;
+ . . S ZB=$P(ZB,"/",2) ; handling gpltest:/note situations
  . S ZC=C0XVOC(ZA)
  . I ZOBJ["nodeID:" D  Q  ;