diff --git a/product/Vifib/Tool/VifibConduit.py b/product/Vifib/Conduit/VifibConduit.py similarity index 100% rename from product/Vifib/Tool/VifibConduit.py rename to product/Vifib/Conduit/VifibConduit.py diff --git a/product/Vifib/Conduit/__init__.py b/product/Vifib/Conduit/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..3a9aa3e400a31a63841eaba33d4c8ba2f60265ac --- /dev/null +++ b/product/Vifib/Conduit/__init__.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved. +# Åukasz Nowak <luke@nexedi.com> +# Romain Courteaud <romain@nexedi.com> +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsibility of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# guarantees and support are strongly advised to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## diff --git a/product/Vifib/Tool/SlapTool.py b/product/Vifib/Tool/SlapTool.py index 16f589a821c3d75782846f1d1532c6b25681e6c4..28dcb73563550095216e423475c46ffb9453a13b 100644 --- a/product/Vifib/Tool/SlapTool.py +++ b/product/Vifib/Tool/SlapTool.py @@ -61,7 +61,7 @@ except ImportError: from zLOG import LOG, INFO import xml_marshaller - +from Products.Vifib.Conduit import VifibConduit class SoftwareInstanceNotReady(Exception): pass @@ -256,7 +256,20 @@ class SlapTool(BaseTool): computer_document = self._getComputerDocument(computer_id) # easy way to start to store usage messages sent by client in related Web # Page text_content... - self._reportComputerUsage(computer_document, use_string) + + #self._reportComputerUsage(computer_document, use_string) + #LOG("check-1", 0, "%s" % use_string) + unmarshalled_usage = xml_marshaller.xml_marshaller.loads(use_string) + #res = unmarshalled_usage.computer_partition_usage_list + + #LOG("check-2", 0, "%s" % res[0].usage) + vifib_conduit_instance = VifibConduit.VifibConduit() + sub_object = vifib_conduit_instance.addNode(object=self, + xml=unmarshalled_usage.computer_partition_usage_list[0].usage) + + #sub_object = vifib_conduit_instance.addNode(object=self, xml=res[0].usage) + #self._reportComputerUsage(computer_document, use_string) + return 'Content properly posted.' security.declareProtected(Permissions.AccessContentsInformation, 'loadComputerConfigurationFromXML')