Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 65E71D8BA for ; Fri, 5 Oct 2012 19:34:09 +0000 (UTC) Received: (qmail 37111 invoked by uid 500); 5 Oct 2012 19:34:09 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 37078 invoked by uid 500); 5 Oct 2012 19:34:09 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 37069 invoked by uid 99); 5 Oct 2012 19:34:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2012 19:34:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2012 19:34:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2783B23889C5 for ; Fri, 5 Oct 2012 19:33:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1394744 - /airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java Date: Fri, 05 Oct 2012 19:33:25 -0000 To: commits@airavata.apache.org From: lahiru@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121005193325.2783B23889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lahiru Date: Fri Oct 5 19:33:24 2012 New Revision: 1394744 URL: http://svn.apache.org/viewvc?rev=1394744&view=rev Log: (empty) Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java?rev=1394744&r1=1394743&r2=1394744&view=diff ============================================================================== --- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java (original) +++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java Fri Oct 5 19:33:24 2012 @@ -139,10 +139,11 @@ public class ExperimentDataRetriever { statement = connection.createStatement(); // String queryString = "SELECT experiment_ID FROM Experiment WHERE user_name ='" + user + "'"; + // FIXME : pass user ID as a regular expression String queryString = "SELECT ed.experiment_ID FROM Experiment_Data ed " + "LEFT JOIN Experiment e " + "ON ed.experiment_ID = e.experiment_ID " + - "WHERE ed.username REGEXP '^" + user + "$'"; + "WHERE ed.username ='" + user + "'"; rs = statement.executeQuery(queryString); if(rs != null){ while (rs.next()) { @@ -357,6 +358,7 @@ public class ExperimentDataRetriever { Class.forName(Utils.getJDBCDriver()).newInstance(); connection = DriverManager.getConnection(connectionURL, Utils.getJDBCUser(), Utils.getJDBCPassword()); statement = connection.createStatement(); + //FIXME : pass user ID as a regular expression String queryString = "SELECT e.experiment_ID, ed.name, ed.username, em.metadata, " + "e.project_name, e.submitted_date " + "FROM Experiment e " + @@ -364,7 +366,7 @@ public class ExperimentDataRetriever { "ON e.experiment_ID = ed.experiment_ID " + "LEFT JOIN Experiment_Metadata em " + "ON ed.experiment_ID = em.experiment_ID " + - "WHERE ed.username REGEXP '^" + user + "$'"; + "WHERE ed.username ='" + user + "'"; rs = statement.executeQuery(queryString); if (rs != null){