Author: michiel
Date: 2010-04-12 16:00:56 +0200 (Mon, 12 Apr 2010)
New Revision: 41840
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/implementation/BasicNodeQuery.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/BridgeClusterQueries.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/ClusterQueries.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSearchQuery.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
Log:
made it compile
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/implementation/BasicNodeQuery.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/implementation/BasicNodeQuery.java
2010-04-12 13:42:34 UTC (rev 41839)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/implementation/BasicNodeQuery.java
2010-04-12 14:00:56 UTC (rev 41840)
@@ -164,7 +164,7 @@
query.setDistinct(distinct);
if (distinct) { // in that case, make sure only the 'explicitely'
added fields remain.
query.removeFields();
- query.addFields(step);
+ query.addFields(step, new BridgeClusterQueries(getCloud()));
implicitFields.clear();
addFields(explicitFields);
}
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/BridgeClusterQueries.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/BridgeClusterQueries.java
2010-04-12 13:42:34 UTC (rev 41839)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/BridgeClusterQueries.java
2010-04-12 14:00:56 UTC (rev 41840)
@@ -73,6 +73,10 @@
}
return null;
}
+ @Override
+ public Collection<Field> getFields(String builder) {
+ return
cloud.getNodeManager(builder).getFields(NodeManager.ORDER_CREATE);
+ }
@Override
public String getTrueTableName(String table) {
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/ClusterQueries.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/ClusterQueries.java
2010-04-12 13:42:34 UTC (rev 41839)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/ClusterQueries.java
2010-04-12 14:00:56 UTC (rev 41840)
@@ -18,7 +18,7 @@
/**
*
* @author Rob van Maris (ClusterBuilder)
- * @version $Id: $
+ * @version $Id$
*/
public abstract class ClusterQueries {
@@ -96,6 +96,8 @@
public abstract Field getField(String builder, String fieldName);
+ public abstract Collection<Field> getFields(String builder);
+
/**
* Returns the name part of a tablename.
* The name part is the table name minus the numeric digit appended
Property changes on:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/ClusterQueries.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSearchQuery.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSearchQuery.java
2010-04-12 13:42:34 UTC (rev 41839)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSearchQuery.java
2010-04-12 14:00:56 UTC (rev 41840)
@@ -454,33 +454,26 @@
}
- public void addFields(Step step) {
- throw new UnsupportedOperationException("TODO");
- /*
- MMBase mmb = MMBase.getMMBase();
- MMObjectBuilder builder = mmb.getBuilder(step.getTableName());
- addFields(step, builder);
- */
+ public void addFields(Step step, ClusterQueries cq) {
+ addFields(step, step.getTableName(), cq);
}
/**
* Add all fields of given step
*/
- /*
- protected void addFields(Step step, MMObjectBuilder builder) {
+ protected void addFields(Step step, String builder, ClusterQueries cq) {
if (! modifiable) throw new IllegalStateException("Unmodifiable");
// http://www.mmbase.org/jira/browse/MMB-1435,
// Using fields with "ORDER_CREATE" only returns fields actually in
storage, and also in the
// right order, which is important for microsoft JDBC.
- for (CoreField field : builder.getFields(NodeManager.ORDER_CREATE)) {
+ for (Field field : cq.getFields(builder)) {
if (! field.isVirtual()) {
BasicStepField stepField = addField(step, field);
mapField(field, stepField);
}
}
}
- */
public void removeFields() {
if (! modifiable) throw new IllegalStateException("Unmodifiable");
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
2010-04-12 13:42:34 UTC (rev 41839)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
2010-04-12 14:00:56 UTC (rev 41840)
@@ -51,19 +51,15 @@
* {...@link org.mmbase.module.core.VirtualBuilder virtual} builder.
* @throws IllegalArgumentException When an invalid argument is supplied.
*/
- /*
- public NodeSearchQuery(String builder) {
+ public NodeSearchQuery(String builder, ClusterQueries cq) {
if (builder == null) {
throw new IllegalArgumentException("Invalid builder value: " +
builder);
}
- if (builder instanceof VirtualBuilder) {
- throw new IllegalArgumentException("Invalid builder type, because
this is a virtual builder: " + builder.getClass().getName());
- }
- Step step = super.addStep(builder.getTableName());
- addFields(step, builder);
- this.builder = builder.getTableName();
+ Step step = super.addStep(builder);
+ addFields(step, builder, cq);
+ this.builder = builder;
}
- */
+
public NodeSearchQuery(NodeManager nodeManager) {
Step step = super.addStep(nodeManager.getName());
for (Field f : nodeManager.getFields(NodeManager.ORDER_CREATE)) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
