Commit 2a714f83 authored by Ivan Tyagov's avatar Ivan Tyagov

Data Supply is a Delivery as it "delivers" a service between two parties.

parent 804dc534
......@@ -50,7 +50,7 @@ It is used by Ingestion Policy.</string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Supply</string> </value>
<value> <string>Delivery</string> </value>
</item>
<item>
<key> <string>type_interface</string> </key>
......
......@@ -80,10 +80,8 @@ if data_chunk is not None and reference is not None:\n
query=ComplexQuery(Query(portal_type = \'Data Supply\'),\n
Query(reference = reference),\n
Query(validation_state = \'validated\'),\n
# XXX: enable when final decision made if Data Supply is a\n
# Delivery or Supply\n
#Query( **{\'delivery.stop_date\':now, \'range\': \'max\'}),\n
#Query( **{\'delivery.start_date\':now, \'range\': \'min\'}),\n
Query( **{\'delivery.stop_date\':now, \'range\': \'min\'}),\n
Query( **{\'delivery.start_date\':now, \'range\': \'max\'}),\n
operator="AND")\n
data_supply = portal_catalog.getResultValue(query=query)\n
\n
......@@ -127,7 +125,7 @@ if data_chunk is not None and reference is not None:\n
else:\n
raise NotFound(\'No data supply configuration found.\')\n
else:\n
raise NotFound(\'No data or any configuration not found.\')\n
raise NotFound(\'No data or any configuration found.\')\n
]]></string> </value>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment