Project

Profile

Help

Revision 08c871b9

Added by O'Neil Delpratt almost 6 years ago

Bug fixes including #2636

View differences:

latest9.6/hec/Saxon.C.API/64-bit-code/HEC/SaxonCGlue.c
19 19
		strncat(resources_dir, env,  env_len);
20 20
		strncat(resources_dir, "/saxon-data", rDir_len);
21 21
		strncat(dllname, env, env_len);
22
		strncat(dllname, "/libsaxon-hec.so", name_len); //rename according to product edition (-hec or -pec)
22
#ifdef __linux__
23
        strncat(dllname, "/libsaxon-hec.so", name_len); //rename according to product edition (-hec or -pec)
24
#elif  defined (__APPLE__) && defined(__MACH__)
25
        strncat(dllname, "/libsaxon-hec.dylib", name_len);
26
#else
27

  
28
#endif
29
        
30
		
23 31
#ifdef DEBUG	
24 32
		printf("resources_dir: %s\n", resources_dir);	
25 33
		printf("envDir: %s\n", env);
latest9.6/hec/Saxon.C.API/64-bit-code/HEC/SaxonCGlue.h
51 51

  
52 52
static char dllname[] =
53 53
    #ifdef __linux__
54
        "/usr/lib64/libsaxon-hec.so";  //rename according to product edition (-hec or -pec) Also make change in the c file
54
        "/usr/lib64/libsaxonhec.so";  //rename according to product edition (-hec or -pec) Also make change in the c file
55 55
    #elif  defined (__APPLE__) && defined(__MACH__)
56
        "/usr/lib/libsaxon-eec.dylib";
56
        "/usr/lib/libsaxon-hec.dylib";
57 57
    #else
58 58
         "C:\\Program Files\\Saxonica\\SaxonHEC1.0.0\\libsaxon-hec.dll";
59 59
    #endif
latest9.6/hec/Saxon.C.API/XdmNode.cpp
2 2
#include "XdmNode.h"
3 3

  
4 4

  
5
XdmNode::XdmNode(jobject obj): XdmItem(obj), nodeKind(UNKNOWN), baseURI(NULL), nodeName(NULL), children(NULL), parent(NULL){
5
XdmNode::XdmNode(jobject obj): XdmItem(obj), nodeKind(UNKNOWN), baseURI(NULL), nodeName(NULL), children(NULL), parent(NULL), attrValues(NULL){
6 6
	childCount = -1;
7 7
	attrCount = -1;
8 8
}
9 9

  
10
XdmNode::XdmNode(XdmNode * p, jobject obj, XDM_NODE_KIND kind): XdmItem(obj), nodeKind(kind), baseURI(NULL), nodeName(NULL), children(NULL), parent(p){
10
XdmNode::XdmNode(XdmNode * p, jobject obj, XDM_NODE_KIND kind): XdmItem(obj), nodeKind(kind), baseURI(NULL), nodeName(NULL), children(NULL), parent(p), attrValues(NULL){
11 11
	childCount = -1;
12 12
	attrCount = -1;
13 13
}
latest9.6/hec/Saxon.C.API/XdmNode.h
89 89
    
90 90
private:
91 91
	const char * baseURI;
92
	const char * nodeName = NULL;
93
	XdmNode ** children = NULL; //caches child nodes when getChildren method is first called;
92
	const char * nodeName;
93
	XdmNode ** children; //caches child nodes when getChildren method is first called;
94 94
	int childCount;
95
	XdmNode * parent = NULL;
96
	XdmNode ** attrValues = NULL;//caches attribute nodes when getAttributeNodes method is first called;
95
	XdmNode * parent;
96
	XdmNode ** attrValues;//caches attribute nodes when getAttributeNodes method is first called;
97 97
	int attrCount;
98 98
	XDM_NODE_KIND nodeKind;
99 99
    
latest9.6/hec/Saxon.C.API/XdmValue.cpp
19 19
		values.push_back(value);
20 20
		xdmSize++; 
21 21
		jValues = NULL;
22
        valueType = NULL
22 23
	}
23 24

  
24 25

  
latest9.6/hec/Saxon.C.API/XdmValue.h
180 180

  
181 181
protected:
182 182
	SaxonProcessor *proc;
183
	char* valueType = NULL;  /*!< Cached. The type of the XdmValue */
183
	char* valueType;  /*!< Cached. The type of the XdmValue */
184 184
	//string valueStr;  /*!< Cached. String representation of the XdmValue, if available */
185 185

  
186 186
	std::vector<XdmItem*> values;

Also available in: Unified diff