Changeset 1383

Timestamp:

Mar 22, 2012, 3:41:24 PM (12 years ago)

Author:

George Lilly

Message:

fixed bug in non-xml inport

Location:

fmts/trunk/p

Files:

• C0XF2N.m (modified) (2 diffs)
• C0XGET1.m (modified) (1 diff)

fmts/trunk/p/C0XF2N.m

@@ -147 +147 @@
  N ZTXTNM
  S ZTXTNM="_TXT_INCOMING_RDF_FILE_"_ZNAME_"_"_$$LKY5 ; NAME FOR TEXT NODE
- D ADD(ZGRAPH,ZSUBJECT,"fmts:rdfSource",ZTXTNM,FARY)
- D ADD(ZGRAPH,ZSUBJECT,"fmts:tag",$$name2tag(ZNAME),FARY)
+ D ADD(ZGRAPH,ZSUBJECT,"fmts:fileSource",ZTXTNM,FARY)
+ D ADD(ZGRAPH,ZSUBJECT,"fmts:fileTag",$$name2tag(ZNAME),FARY)
  D SWUPDIE(.C0XFDA) ; TRY IT OUT
  K C0XCNT ;RESET FOR NEXT TIME
  D STORETXT(ZRDF,ZTXTNM,FARY)
- W !,"ADDED: ",ZGRAPH," ",ZSUBJECT," fmts:rdfSource ",ZTXTNM
+ W !,"ADDED: ",ZGRAPH," ",ZSUBJECT," fmts:fileSource ",ZTXTNM
  D PROCESS(.G,ZRDF,ZNAME,ZGRAPH,FARY) ; PARSE AND INSERT THE RDF
  Q
@@ -241 +241 @@
  S C0XDLC2=$$NOW^XLFDT ; START OF PARSE
  I @ZRDF@(1)'["<?xml" D  Q  ;
+ . K @ZRDF ; don't need the input buffer
  . W !,"Not an XML file"
  S C0XDOCID=$$EN^MXMLDOM(ZRDF,"W") ; 

fmts/trunk/p/C0XGET1.m

@@ -451 +451 @@
  ; associated with ztag
  n zs,zo
- s zs=$$subject("fmts:tag",ztag)
+ s zs=$$subject("fmts:fileTag",ztag)
  i zs="" d  q  ;
  . w !,"error, tag is either missing or there are more than one ",ztag
- s zo=$$object(zs,"fmts:rdfSource")
+ s zo=$$object(zs,"fmts:fileSource")
  i zo="" d  q  ;
  . w !,"error, tag source not found ",zs