diff options
| author | Bastian Wissler | 2009-08-26 16:46:16 +0200 |
|---|---|---|
| committer | Bastian Wissler | 2009-08-26 16:46:16 +0200 |
| commit | 67064b9d58b1b514f15e06b62fcbe74945e31243 (patch) | |
| tree | 62ef9f3e20229e795426e748ac026171dd806264 /vmchooser/readXmlDir.cxx | |
| parent | vmchooser bug: (diff) | |
| download | vmchooser-67064b9d58b1b514f15e06b62fcbe74945e31243.tar.gz vmchooser-67064b9d58b1b514f15e06b62fcbe74945e31243.tar.xz vmchooser-67064b9d58b1b514f15e06b62fcbe74945e31243.zip | |
Version 0.0.12 of vmchooser ;-)
===============================
* now omits <active> flag when starting xml explicitly
* reads <active param="false" /> and just does not display them
* fixed ugly bug, when the above mentioned flag was false ;-)
git-svn-id: http://svn.openslx.org/svn/openslx/openslx-src-tools/vmchooser/trunk@3135 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'vmchooser/readXmlDir.cxx')
| -rw-r--r-- | vmchooser/readXmlDir.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vmchooser/readXmlDir.cxx b/vmchooser/readXmlDir.cxx index d3a2f70..b90238b 100644 --- a/vmchooser/readXmlDir.cxx +++ b/vmchooser/readXmlDir.cxx @@ -204,10 +204,11 @@ DataEntry* get_entry(xmlDoc * doc) tempc = getAttribute(doc,(char *) "active"); if (tempc != NULL ) { de->active = (strstr(tempc,"true")!= NULL?true:false); - if(de->active == false) { - delete de; - return NULL; - } + // This has to be considered elsewhere + //if(de->active == false) { + // delete de; + // return NULL; + //} } tempc = NULL; @@ -278,10 +279,10 @@ DataEntry** readXmlDir(char* path) bfs::path filter(string(fpath).append("/").append(filterscript)); - if(bfs::is_regular_file(filter)) { + if(bfs::is_regular(filter)) { if( (inp = popen(string(fpath).append("/") .append(filterscript).append(" ") - .append(path).c_str(), "r" )) && bfs::is_regular_file(filter) ) { + .append(path).c_str(), "r" )) ) { while(fgets(line, MAX_LENGTH, inp ) != NULL) { xmlVec.push_back(string(line).substr(0,strlen(line)-1) ); } |