[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
certi/libCERTI RootObject.cc XmlParser.cc
From: |
certi-cvs |
Subject: |
certi/libCERTI RootObject.cc XmlParser.cc |
Date: |
Tue, 04 Dec 2007 11:00:59 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 07/12/04 11:00:59
Modified files:
libCERTI : RootObject.cc XmlParser.cc
Log message:
bug #20935 : Qualified name not handled
Additionnal fix for the XML parser.
FED file hierarchical parsing was OK
XML was not.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/RootObject.cc?cvsroot=certi&r1=3.29&r2=3.30
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/XmlParser.cc?cvsroot=certi&r1=3.24&r2=3.25
Patches:
Index: RootObject.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/RootObject.cc,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- RootObject.cc 31 Oct 2007 10:30:20 -0000 3.29
+++ RootObject.cc 4 Dec 2007 11:00:58 -0000 3.30
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RootObject.cc,v 3.29 2007/10/31 10:30:20 erk Exp $
+// $Id: RootObject.cc,v 3.30 2007/12/04 11:00:58 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -56,7 +56,7 @@
RootObject::RootObject(SecurityServer *security_server)
: server(security_server), regionHandles(1)
{
- ObjectClasses = new ObjectClassSet(server);
+ ObjectClasses = new ObjectClassSet(server,true);
Interactions = new InteractionSet(server);
objects = new ObjectSet(server);
}
@@ -320,4 +320,4 @@
} // namespace certi
-// $Id: RootObject.cc,v 3.29 2007/10/31 10:30:20 erk Exp $
+// $Id: RootObject.cc,v 3.30 2007/12/04 11:00:58 erk Exp $
Index: XmlParser.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/XmlParser.cc,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- XmlParser.cc 31 Oct 2007 10:30:21 -0000 3.24
+++ XmlParser.cc 4 Dec 2007 11:00:59 -0000 3.25
@@ -165,10 +165,17 @@
ObjectClass* current = new ObjectClass();
current->setName(CleanXmlGetProp(cur,ATTRIBUTE_NAME));
current->setHandle(freeObjectClassHandle++);
- root->ObjectClasses->addClass(current);
+
if (parent != 0)
root->ObjectClasses->buildParentRelation(current, parent);
+ /* FIXME EN we must add the class to object root
+ * after we did build the parent relation
+ * this is awkward but we need it for
+ * the "server" link to be OK
+ * We need to fix this.
+ */
+ root->ObjectClasses->addClass(current);
cur = cur->xmlChildrenNode ;
while (cur != NULL) {
// Attributes
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- certi/libCERTI RootObject.cc XmlParser.cc,
certi-cvs <=