Changeset 1380

Timestamp:

Mar 21, 2012, 10:35:26 PM (12 years ago)

Author:

George Lilly

Message:

change for non-xml incoming files

File:

• fmts/trunk/p/C0XF2N.m (modified) (3 diffs)

fmts/trunk/p/C0XF2N.m

@@ -38 +38 @@
  S @ZFARY@("C0XTN")=$NA(^C0X(101)) ; TRIPLES GLOBAL NAME
  S @ZFARY@("C0XSN")=$NA(^C0X(201)) ; STRING FILE GLOBAL NAME
- S @ZFARY@("C0XDIR")="/home/glilly/fmts/trunk/samples/smart-rdf-in/"
+ S @ZFARY@("C0XDIR")="/home/glilly/sage/test/"
  S @ZFARY@("BLKLOAD")=1 ; this file supports block load
  S @ZFARY@("FMTSSTYLE")="F2N" ; fileman style
@@ -235 +235 @@
  ;S C0XDOCID=$$PARSE^C0CNHIN(ZRDF,"C0XARRAY") ; PARSE WITH MXML
  S C0XDLC2=$$NOW^XLFDT ; START OF PARSE
+ I @ZRDF@(1)'["<?xml" D  Q  ;
+ . W !,"Not an XML file"
  S C0XDOCID=$$EN^MXMLDOM(ZRDF,"W") ; 
  ;B
@@ -633 +635 @@
  ;  
 SWUPDIE(ZFDA) ; SWITCH BETWEEN UPDIE AND BULKLOAD
- . I $G(BLKLOAD) D  ; bulk load
- . . D BULKLOAD(.ZFDA) ; bulk load the batch
- . E  D  ; no bulk load
- . . D UPDIE(.ZFDA)
- . K ZFDA
+ I $G(BLKLOAD)=1 D  ; bulk load
+ . D BULKLOAD(.ZFDA) ; bulk load the batch
+ E  D  ; no bulk load
+ . D UPDIE(.ZFDA)
+ K ZFDA
  Q
  ;