#include "basics.h"\r
-//#include <cstring>\r
-#include <stack>\r
#include "XMLTree.h"\r
#include "timings.h"\r
+#include <errno.h>\r
+using std::cout;\r
+using std::endl;\r
+using std::min;\r
+using std::string;\r
\r
// functions to convert tag positions to the corresponding tree node and viceversa. \r
// These are implemented in order to be able to change the tree and Tags representations, \r
\r
static treeNode fast_next_sibling(bp* Par,treeNode x)\r
{\r
- x = fwd_excess(Par,x,0);\r
+ x = fast_find_close(Par,x)+1;\r
return (fast_inspect(Par,x) == OP) ? x : NULLT;\r
}\r
\r
}\r
\r
// Save: saves XML tree data structure to file. \r
-void XMLTree::Save(int fd) \r
+void XMLTree::Save(int fd, char *filename) \r
{\r
FILE *fp;\r
char filenameaux[1024];\r
\r
// stores the texts \r
if (!disable_tc) {\r
- Text->Save(fp);\r
+ Text->Save(fp, filename);\r
};\r
-\r
-\r
}\r
\r
\r
// Load: loads XML tree data structure from file. Returns\r
// a pointer to the loaded data structure\r
-XMLTree *XMLTree::Load(int fd, bool load_tc,int sample_factor) \r
+XMLTree *XMLTree::Load(int fd, char *filename, bool load_tc,int sample_factor) \r
{\r
\r
FILE *fp;\r
XMLTree *XML_Tree;\r
int i;\r
\r
-\r
+ buffer[1023] = '\0';\r
\r
fp = fdopen(fd, "r");\r
\r
PRINTTIME("Loading parenthesis struct", Loading);\r
STARTTIMER();\r
\r
- XML_Tree->TagName = new vector<string>();\r
- XML_Tree->tIdMap = new std::unordered_map<string,int>();\r
- \r
- string s;\r
+ XML_Tree->TagName = new std::vector<std::string>();\r
+ XML_Tree->tIdMap = new std::unordered_map<std::string,int>();\r
+ std::string s;\r
int ntags;\r
\r
// Load the tag names\r
ufread(&ntags, sizeof(int), 1, fp);\r
\r
for (i=0; i<ntags;i++) {\r
- char * r = fgets(buffer,1023,fp);\r
- if (r==NULL)\r
+ if (fgets(buffer,1022,fp) != buffer)\r
throw "Cannot read tag list";\r
- s = (const char*) buffer;\r
+ s = buffer;\r
// remove the trailing \n\r
s.erase(s.size()-1); \r
- XML_Tree->TagName->push_back(s);\r
+ XML_Tree->TagName->push_back(s); \r
XML_Tree->tIdMap->insert(std::make_pair(s,i));\r
\r
};\r
// Not used \r
// loads the texts\r
if (!XML_Tree->disable_tc){\r
- XML_Tree->Text = TextCollection::Load(fp,sample_factor);\r
+ XML_Tree->Text = TextCollection::Load(fp, filename, TextCollection::index_mode_default, sample_factor);\r
}\r
else XML_Tree->Text = NULL;\r
STOPTIMER(Loading);\r
\r
int s = x + 2*subtree_size(Par, x) - 1;\r
\r
- return Tags->rank(tag, s) - Tags->rank(tag, node2tagpos(x)-1);\r
+ return (Tags->rank(tag, s) - Tags->rank(tag, node2tagpos(x)-1))+1;\r
}\r
int XMLTree::SubtreeElements(treeNode x) \r
{\r
}\r
else return x; \r
}\r
-value XMLTree::CamlFirstElement(value x)\r
-{\r
- return Val_int(FirstElement(Int_val(x)));\r
-}\r
-value XMLTree::CamlNextElement(value x)\r
-{\r
- return Val_int(NextElement(Int_val(x)));\r
-}\r
-\r
-extern "C" value caml_cpp_fast_first_element(value xmltree, value node){\r
- return XMLTREE(xmltree)->CamlFirstElement(node);\r
-}\r
-\r
-extern "C" value caml_cpp_fast_next_element(value xmltree, value node){\r
- return XMLTREE(xmltree)->CamlNextElement(node);\r
-}\r
\r
// LastChild(x): returns the last child of node x.\r
treeNode XMLTree::LastChild(treeNode x)\r
//WARNING this uses directly the underlying implementation for plain text\r
\r
\r
-\r
void XMLTree::Print(int fd,treeNode x, bool no_text){\r
\r
int newfd = dup(fd);\r
stream = fdopen(newfd,"wa");\r
+ if (stream == 0){\r
+ perror(NULL);\r
+ return;\r
+ };\r
+\r
if (buffer == 0)\r
buffer = new string();\r
\r
uchar * tagstr;\r
range r = DocIds(x);\r
treeNode first_idx;\r
- treeNode first_text = (tag == PCDATA_TAG_ID ? x : TaggedDescendant(x,PCDATA_TAG_ID));\r
- treeNode first_att = NULLT;//TaggedDesc(x,ATTRIBUTE_DATA_TAG_ID);\r
+ treeNode first_text = (tag == PCDATA_TAG_ID ? x : ParentNode(r.min-1));\r
+ treeNode first_att = NULLT;\r
\r
if (first_att == NULLT)\r
first_idx = first_text;\r
uchar * current_text=NULL;\r
if (first_idx != NULLT)\r
current_text = GetText(MyText(first_idx));\r
- int read = 0;\r
+ size_t read = 0;\r
std::vector<uchar*> st;\r
while (n <= fin){\r
if (fast_inspect(Par,n)){\r
if (tag == PCDATA_TAG_ID ) { \r
- // myfputs((const char*) (GetText(MyTextUnsafe(n))),fp);\r
+\r
if (no_text)\r
myfputs("<$/>",fp);\r
else{\r
- read = fprintf(fp,"%s",(const char*) current_text);\r
- current_text += (read + 1);\r
- }\r
+ read = myfprintf((const char*) current_text, fp);\r
+ current_text += (read + 1);\r
+ };\r
n+=2; // skip closing $\r
tag = Tag(n);\r
\r
while (fast_inspect(Par,n)){\r
if (no_text) {\r
myfputc('<',fp);\r
- const uchar * tmp = &(GetTagNameByRef(Tag(n))[3]);\r
- myfputs((const char*) tmp,fp);\r
+ myfputs((const char*) &(GetTagNameByRef(Tag(n))[3]),fp);\r
myfputc('>',fp);\r
myfputs("<$@/></",fp);\r
- myfputs((const char*) tmp,fp);\r
+ myfputs((const char*) &(GetTagNameByRef(Tag(n))[3]),fp);\r
myfputc('>',fp);\r
n+= 4;\r
}\r
myfputs((const char*) &(GetTagNameByRef(Tag(n))[3]),fp);\r
n++;\r
myfputs("=\"",fp);\r
- read = fprintf(fp,"%s",(const char*) current_text);\r
+ read = myfprintf((const char*) current_text,fp);\r
current_text += (read + 1);\r
- //myfputs((const char*) GetText(MyTextUnsafe(n)),fp);\r
myfputc('"',fp);\r
n+=3;\r
}\r
}while (!fast_inspect(Par,n) && !st.empty());\r
tag=Tag(n);\r
};\r
- //myfputc('\n',fp);\r
+ myfputc('\n',fp);\r
mybufferflush(fp);\r
- fflush(fp);\r
+ //fflush(fp);\r
fclose(fp);\r
}\r
projects / SXSI / XMLTree.git / blobdiff