D-Net

<ivy-module version="1.0">

	<info organisation="driver" module="uoa-web-generic" status="integration" />

	<configurations defaultconfmapping="*->default">

		<conf name="default" />

		<conf name="junit" visibility="private" extends="default" />

	</configurations>

	<publications>

		<artifact name="uoa-web-generic" type="jar" />

		<artifact name="uoa-web-generic" type="war" />

		<artifact name="uoa-web-generic" type="src" ext="zip" />

	</publications>

	<dependencies>

		<dependency org="log4j" name="log4j" rev="+" />

		<dependency org="javax" name="mail" rev="1.4" />

		<dependency org="javax.servlet" name="servlet-api" rev="2.5" />

		<dependency org="org.apache.struts" name="struts2-core"	rev="${struts2.version}" />

		<dependency org="org.apache.struts" name="struts2-spring-plugin" rev="${struts2.version}" />

		<dependency org="org.apache.struts" name="struts2-dojo-plugin" rev="${struts2.version}" />

		<dependency org="google" name="jsonplugin" rev="+" />

		<dependency org="org.apache.cxf" name="cxf-api" rev="${cxf.version}" />

		<dependency org="org.apache.cxf" name="cxf-rt-core" rev="${cxf.version}" />

		<dependency org="org.apache.cxf" name="cxf-rt-bindings-soap" rev="${cxf.version}" />

		<dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="${cxf.version}" />

		<dependency org="org.apache.cxf" name="cxf-rt-transports-http-jetty" rev="${cxf.version}" />

		<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="${cxf.version}" />

		<dependency org="driver" name="uoa-commons" rev="0.0.+" />

		<dependency org="driver" name="uoa-hcm" rev="0.0.+" />

		<dependency org="driver" name="uoa-clients" rev="0.0.+" />

		<dependency org="driver" name="dnet-runtime" rev="0.0.+" />

		<dependency org="driver" name="dlms-jdbc-connector" rev="0.+" />

		<dependency org="driver" name="uoa-web-utils" rev="0.0.+" />

		<dependency org="org.mockito" name="mockito-core" rev="1.6" conf="junit"/>

		<exclude org="apache" module="xerces" />

	</dependencies>

</ivy-module>

<ivysettings>

  <include file="${yvy.build.dir}/ivysettings.xml"/>

  <settings defaultResolver="yvy-resolver" default="yvy.default.cache" defaultCacheDir="${yvy.cache.dir}"/>

</ivysettings>

source.dirs		= main

project.name		= uoa-web-generic

project.version		= 0.0.7

project.label = staticize

static.src.dir = ../../uoa-web-static/src

pages.src.dir = ../../uoa-web-jsp/src

<project name="uoa-web-generic" default="build">

	<!--

	organisation:		driver

	module: 		uoa-web-generic

	-->

	<property file="local.properties"/>

	<!-- Layout paths properties -->

	<property file="../../build/yvy-setup.properties"/>

	<property file="../../../../build/yvy-trunk.properties"/>

	<property file="../../../../../build/yvy-tag.properties"/>

	<property file="build.properties"/>

	<property name="yvy.build.common" value="${yvy.root.dir}/build/build-common.xml"/>

	<!-- Common build definitions -->

	<import file="${yvy.build.common}"/>

	<target name="build" depends="jar"/>

	<target name="default">

		<antcall target="${yvy.target.build}" inheritAll="true" inheritRefs="true"/>

	</target>

	<target name="recolecta">

		<property name="setup.name" value="recolecta"/>

		<antcall target="generic.war"  inheritAll="true" inheritRefs="true"/>

	</target>

	<target name="polish">

		<property name="setup.name" value="polish" />

		<antcall target="generic.war" inheritAll="true" inheritRefs="true" />

	</target>

	<target name="driver">

		<property name="setup.name" value="driver"/>

		<antcall target="generic.war"  inheritAll="true" inheritRefs="true"/>

	</target>

	<target name="generic.war" depends="yvy.jar,yvy.war.not_required" unless="yvy.war.build.not_required">

		<delete dir="${main.bin.dir}/${webapp.dirs}" />

		<mkdir dir="${main.bin.dir}/${webapp.dirs}" />

		<copy todir="${main.bin.dir}/${webapp.dirs}">

			<fileset dir="${main.src.dir}/${webapp.dirs}">

				<include name="**/*.*" />

				<exclude name="**/.svn" />

				<exclude name="**/.svn/**" />

			</fileset>

		</copy>

		<copy todir="${main.bin.dir}/${webapp.dirs}/static-content" overwrite="true">

			<fileset dir="${static.src.dir}/default">

				<include name="**/*.*" />

				<exclude name="**/.svn" />

				<exclude name="**/.svn/**" />

			</fileset>

		</copy>

		<copy todir="${main.bin.dir}/${webapp.dirs}/static-content" overwrite="true">

			<fileset dir="${static.src.dir}/${setup.name}"> 

				<include name="**/*.*" />

				<exclude name="**/.svn" />

				<exclude name="**/.svn/**" />

			</fileset>

		</copy>

		<copy todir="${main.bin.dir}/${webapp.dirs}/pages" overwrite="true">

			<fileset dir="${pages.src.dir}/default">

				<include name="**/*.*" />

				<exclude name="**/.svn" />

				<exclude name="**/.svn/**" />

			</fileset>

		</copy>

		<copy todir="${main.bin.dir}/${webapp.dirs}/pages" overwrite="true">

			<fileset dir="${pages.src.dir}/${setup.name}">			

				<include name="**/*.*" />

				<exclude name="**/.svn" />

				<exclude name="**/.svn/**" />

			</fileset>

		</copy>

		<build-war sources="${webapp.dirs}" />

	</target>

</project>

package gr.uoa.di.webui.search;

import org.apache.log4j.BasicConfigurator;

import org.junit.Test;

import eu.dnetlib.utils.cql.CqlException;

public class CriteriaManagerTest {

	@Test

	public void convertDateTest() throws CqlException {

		BasicConfigurator.configure();

//		LayoutManager layoutManager = mock(LayoutManager.class);

//		CriteriaManager criteriaManager = new CriteriaManager(layoutManager, new HashMap<String, Vocabulary>());

//		

//		String url = "title = title OR title = given AND me";

//		System.out.println("1: " + criteriaManager.convert(url, Target.URL));

//		

//		System.out.println("==============================================");

//		url = "me AND title = title";

//		System.out.println("2: " + criteriaManager.convert(url, Target.URL));

//		

	}

}

package gr.uoa.di.webui.search;

import gr.uoa.di.web.utils.search.query.QueryCollectionEnhancer;

import java.util.ArrayList;

import junit.framework.Assert;

import junit.framework.TestCase;

public class QueryCollectionEnhancementTest extends TestCase {

	private QueryCollectionEnhancer enhancer = new QueryCollectionEnhancer();

	private String query = "no matter what query";

	public void testEmptyCollectionList(){

		enhancer.setCollectionIds(new ArrayList<String>());

		Assert.assertEquals(query, enhancer.enhanceQuery(query));

	}

	public void testNonEmptyCollectionList(){

		enhancer.setCollectionIds(new ArrayList<String>());

		enhancer.getCollectionIds().add("12345");

		Assert.assertEquals(query + " AND ( (collection = \"12345\") )",enhancer.enhanceQuery(query));

		enhancer.getCollectionIds().add("67890");

		Assert.assertEquals

			(query + " AND ( (collection = \"12345\") OR (collection = \"67890\") )",

				enhancer.enhanceQuery(query));

	}

}