projects
/
SXSI
/
XMLTree.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting.
[SXSI/XMLTree.git]
/
xml-tree.cpp
diff --git
a/xml-tree.cpp
b/xml-tree.cpp
index
d31c1ce
..
e230d9b
100644
(file)
--- a/
xml-tree.cpp
+++ b/
xml-tree.cpp
@@
-95,14
+95,13
@@
xml_tree::xml_tree(std::vector<int32_t> *tags_,
delete parbitmap;
this->tag_ids = tag_ids;
delete parbitmap;
this->tag_ids = tag_ids;
+
tag_names = new std::vector<std::string>();
tag_names->resize(tag_ids->size());
tag_names = new std::vector<std::string>();
tag_names->resize(tag_ids->size());
+
std::unordered_map<std::string, tag_t>::iterator val;
std::unordered_map<std::string, tag_t>::iterator val;
- //for(auto val : *(this->tag_ids))
- //(*this->tag_names)[val.second] = val.first;
for(val = this->tag_ids->begin(); val != this->tag_ids->end(); ++val)
for(val = this->tag_ids->begin(); val != this->tag_ids->end(); ++val)
- (*this->tag_names)[val->second] = val->first;
-
+ (*tag_names)[val->second] = val->first;
uint32_t max_tag = tag_names->size() - 1;
bit_vector *tmp_bitmap = new bit_vector(npar, 1, 0);
uint32_t max_tag = tag_names->size() - 1;
bit_vector *tmp_bitmap = new bit_vector(npar, 1, 0);
@@
-439,12
+438,10
@@
void xml_tree::uputc(const char c, int fd)
const char * xml_tree::get_tag_name_by_ref(xml_tree::tag_t tagid) const
{
const char * xml_tree::get_tag_name_by_ref(xml_tree::tag_t tagid) const
{
-
- unsigned char *s;
if (tagid < 0 || tagid >= tag_names->size())
return "<INVALID TAG>";
if (tagid < 0 || tagid >= tag_names->size())
return "<INVALID TAG>";
- return (
const char *) (
*tag_names)[tagid].c_str();
+ return (*tag_names)[tagid].c_str();
}
xml_tree::tag_t xml_tree::register_tag(char *s)
}
xml_tree::tag_t xml_tree::register_tag(char *s)