Changeset 553


Ignore:
Timestamp:
09/18/12 17:07:17 (12 years ago)
Author:
npipsl
Message:

transitions

Location:
geisa
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • geisa/persistence/implementation/com/ether/dao/IsotopeG03DAOImpl.java

    r542 r553  
    55import com.ether.PersistenceException; 
    66import org.hibernate.criterion.DetachedCriteria; 
     7import org.hibernate.criterion.Order; 
    78import org.hibernate.criterion.Projection; 
    89import org.hibernate.criterion.Projections; 
    … …  
    1112 
    1213import java.util.HashSet; 
     14import java.util.LinkedHashSet; 
    1315import java.util.List; 
    1416import java.util.Set; 
    … …  
    5658                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    5759                .add( Restrictions.eq( "codeQuantLower",transitionLower ) ); 
    58             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     60        criteria.addOrder( Order.asc( "codeQuantUpper" ) ); 
     61        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     62 
    5963 
    6064        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    61         return new HashSet<String>( transitions ); 
     65        return new LinkedHashSet<String>( transitions ); 
    6266    } 
    6367 
    … …  
    6771    { 
    6872 
    69           final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeG03.class ) 
     73        final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeG03.class ) 
    7074                .add( Restrictions.in( "chMoleIsot", isotopesSelectedNameList ) ) 
    7175                .add( Restrictions.ge( "wavenbMax", spectralRangeLower ) ) 
    7276                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    7377                .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) ); 
    74             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     78        /*classer par ordre croissant*/ 
     79        criteria.addOrder( Order.asc("codeQuantLower") ); 
     80        /*enlever les doublons*/ 
     81        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     82 
    7583 
    7684        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    77         return new HashSet<String>( transitions ); 
     85        return new LinkedHashSet<String>( transitions ); 
    7886    } 
    7987 
    … …  
    102110 
    103111        if(isForUpper) 
    104             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     112            criteria.addOrder( Order.asc( "codeQuantUpper" ) ) 
     113                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) ); 
    105114        else 
    106             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     115            criteria.addOrder( Order.asc("codeQuantLower") ) 
     116                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) ); 
    107117 
    108118        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    109         return new HashSet<String>( transitions ); 
     119        return new LinkedHashSet<String> ( transitions ); 
    110120    } 
    111121 

  • geisa/persistence/implementation/com/ether/dao/IsotopeG09DAOImpl.java

    r542 r553  
    55import com.ether.PersistenceException; 
    66import org.hibernate.criterion.DetachedCriteria; 
     7import org.hibernate.criterion.Order; 
    78import org.hibernate.criterion.Projections; 
    89import org.hibernate.criterion.Restrictions; 
    … …  
    1011 
    1112import java.util.HashSet; 
     13import java.util.LinkedHashSet; 
    1214import java.util.List; 
    1315import java.util.Set; 
    … …  
    3638                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    3739                .add( Restrictions.eq( "codeQuantLower",transitionLower ) ); 
    38             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     40        criteria.addOrder( Order.asc( "codeQuantUpper" ) ); 
     41        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
    3942 
    4043        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    41         return new HashSet<String>( transitions ); 
     44        return new LinkedHashSet<String>( transitions ); 
    4245    } 
    4346 
    … …  
    5255                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    5356                .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) ); 
    54             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     57        criteria.addOrder( Order.asc("codeQuantLower") ); 
     58        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
    5559 
    5660        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    57         return new HashSet<String>( transitions ); 
     61        return new LinkedHashSet<String>( transitions ); 
    5862    } 
    5963 
    … …  
    8286 
    8387        if(isForUpper) 
    84             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     88            criteria.addOrder( Order.asc( "codeQuantUpper" ) ) 
     89                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) ); 
    8590        else 
    86             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     91            criteria.addOrder( Order.asc("codeQuantLower") ) 
     92                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) ); 
    8793 
    8894        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    89         return new HashSet<String>( transitions ); 
     95        return new LinkedHashSet<String> ( transitions ); 
    9096    } 
    9197 

  • geisa/persistence/implementation/com/ether/dao/IsotopeIasiG03DAOImpl.java

    r542 r553  
    66import com.ether.PersistenceException; 
    77import org.hibernate.criterion.DetachedCriteria; 
     8import org.hibernate.criterion.Order; 
    89import org.hibernate.criterion.Projections; 
    910import org.hibernate.criterion.Restrictions; 
    … …  
    1112 
    1213import java.util.HashSet; 
     14import java.util.LinkedHashSet; 
    1315import java.util.List; 
    1416import java.util.Set; 
    … …  
    3840                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    3941                .add( Restrictions.eq( "codeQuantLower",transitionLower ) ); 
    40             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     42        criteria.addOrder( Order.asc( "codeQuantUpper" ) ); 
     43        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
    4144 
    4245        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    43         return new HashSet<String>( transitions ); 
     46        return new LinkedHashSet<String>( transitions ); 
    4447    } 
    4548 
    … …  
    5457                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    5558                .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) ); 
    56             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     59        criteria.addOrder( Order.asc("codeQuantLower") ); 
     60        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
    5761 
    5862        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    59         return new HashSet<String>( transitions ); 
     63        return new LinkedHashSet<String>( transitions ); 
    6064    } 
    6165 
    … …  
    8589 
    8690        if(isForUpper) 
    87             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     91            criteria.addOrder( Order.asc( "codeQuantUpper" ) ) 
     92                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) ); 
    8893        else 
    89             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     94            criteria.addOrder( Order.asc("codeQuantLower") ) 
     95                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) ); 
    9096 
    9197        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    92         return new HashSet<String>( transitions ); 
     98        return new LinkedHashSet<String> ( transitions ); 
    9399    } 
    94100 

  • geisa/persistence/implementation/com/ether/dao/IsotopeIasiG09DAOImpl.java

    r542 r553  
    66import com.ether.PersistenceException; 
    77import org.hibernate.criterion.DetachedCriteria; 
     8import org.hibernate.criterion.Order; 
    89import org.hibernate.criterion.Projections; 
    910import org.hibernate.criterion.Restrictions; 
    … …  
    1112 
    1213import java.util.HashSet; 
     14import java.util.LinkedHashSet; 
    1315import java.util.List; 
    1416import java.util.Set; 
    … …  
    3638                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    3739                .add( Restrictions.eq( "codeQuantLower",transitionLower ) ); 
    38             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     40        criteria.addOrder( Order.asc( "codeQuantUpper" ) ); 
     41        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
    3942 
    4043        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    41         return new HashSet<String>( transitions ); 
     44        return new LinkedHashSet<String>( transitions ); 
    4245    } 
    4346 
    … …  
    5255                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    5356                .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) ); 
    54             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     57        criteria.addOrder( Order.asc("codeQuantLower") ); 
     58        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
    5559 
    5660        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    57         return new HashSet<String>( transitions ); 
     61        return new LinkedHashSet<String>( transitions ); 
    5862    } 
    5963 
    … …  
    8286 
    8387        if(isForUpper) 
    84             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     88            criteria.addOrder( Order.asc( "codeQuantUpper" ) ) 
     89                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) ); 
    8590        else 
    86             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     91            criteria.addOrder( Order.asc("codeQuantLower") ) 
     92                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) ); 
    8793 
    8894        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    89         return new HashSet<String>( transitions ); 
     95        return new LinkedHashSet<String> ( transitions ); 
    9096    } 
    9197 

  • geisa/web/initGeisa_script.jsp

    r552 r553  
    10771077                // TransitionLower =""; 
    10781078                // } 
    1079                   if (( document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == -1) ||  (document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == "transition" )) 
    1080                  { 
    1081                 transitionUpper ="no"; 
    1082                 } 
    1083                  if (( document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value == -1) ||  (document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value == "transition" )) 
    1084                  { 
    1085                  transitionLower ="no"; 
    1086                  } 
    1087  
     1079                if (( document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == -1) ||  (document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == "transition" )) 
     1080                { 
     1081                    transitionUpper ="no"; 
     1082                } 
     1083                if (( document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value == -1) ||  (document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value == "transition" )) 
     1084                { 
     1085                    transitionLower ="no"; 
     1086                } 
     1087 
     1088                if ( document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == "") 
     1089                { 
     1090                    transitionUpper ="noValue"; 
     1091                } 
     1092 
     1093                if ( document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value == "") 
     1094                { 
     1095                    transitionLower ="noValue"; 
     1096                } 
    10881097 
    10891098                 var sel = document.getElementById('transition1'); 
    … …  
    13591368                } 
    13601369 
     1370                 //le passage de javascript à java par ajax transforme les + en espace donc transformation des + en plus et dans le controller on fait l'inverse 
     1371                 var transitionLowerReplaced = context.transitionLower.replace(/\+/g,"plus"); 
     1372 
    13611373                //Appel à la BDD 
    13621374 
    13631375                $.ajax( { 
    1364                             url: "project?methodName=getTransitionByIsotopeNameByTransitionLower&isotopesSelectedNameArray="+isotopesSelectedNameArray+"&geisaSelectedDatabase="+context.selectDatabase.getValue2()+"&spectralRangeLower="+spectralRangeLower+"&spectralRangeUpper="+spectralRangeUpper+"&transitionLower="+context.transitionLower, 
     1376                            url: "project?methodName=getTransitionByIsotopeNameByTransitionLower&isotopesSelectedNameArray="+isotopesSelectedNameArray+"&geisaSelectedDatabase="+context.selectDatabase.getValue2()+"&spectralRangeLower="+spectralRangeLower+"&spectralRangeUpper="+spectralRangeUpper+"&transitionLower="+transitionLowerReplaced, 
    13651377                            success:jQuery.proxy( context.handleRequestTransitionByTransitionLower, context) 
    13661378                        } ); 
    … …  
    14041416 
    14051417                } 
     1418                //le passage de javascript à java par ajax transforme les + en espace donc transformation des + en plus et dans le controller on fait l'inverse 
     1419                var transitionUpperReplaced = context.transitionUpper.replace(/\+/g,"plus"); 
    14061420 
    14071421                //Appel à la BDD 
    1408  
    14091422                $.ajax( { 
    1410                             url: "project?methodName=getTransitionByIsotopeNameByTransitionUpper&isotopesSelectedNameArray="+isotopesSelectedNameArray+"&geisaSelectedDatabase="+context.selectDatabase.getValue2()+"&spectralRangeLower="+spectralRangeLower+"&spectralRangeUpper="+spectralRangeUpper+"&transitionUpper="+context.transitionUpper, 
     1423                            url: "project?methodName=getTransitionByIsotopeNameByTransitionUpper&isotopesSelectedNameArray="+isotopesSelectedNameArray+"&geisaSelectedDatabase="+context.selectDatabase.getValue2()+"&spectralRangeLower="+spectralRangeLower+"&spectralRangeUpper="+spectralRangeUpper+"&transitionUpper="+transitionUpperReplaced, 
    14111424                            success:jQuery.proxy( context.handleRequestTransitionByTransitionUpper, context) 
    14121425                        } ); 

  • geisa/web/src/com/ether/Controller.java

    r552 r553  
    6363            //Pour lancer le programme fortran 
    6464//            Process p = Runtime.getRuntime().exec("/home/npipsl/Desktop/geisa-Graphique/prog-ether/graph.sh  " + fortranRequest + " " + timeInMillis + ""); 
    65            // Process p = Runtime.getRuntime().exec(PATH_PROCESS+File.separatorChar+"graph.sh  " + fortranRequest + " " + timeInMillis + ""); 
    66         //////// Process p = Runtime.getRuntime().exec(PATH_PROCESS+"graph.sh  " + fortranRequest + " " + timeInMillis + ""); 
    67                  Process p = Runtime.getRuntime().exec(PATH_PROCESS+"graph.sh  " + fortranRequest + " " + transitionUpper  + " " + transitionLower +" " + timeInMillis + ""); 
     65            // Process p = Runtime.getRuntime().exec(PATH_PROCESS+File.separatorChar+"graph.sh  " + fortranRequest + " " + timeInMillis + ""); 
     66            //////// Process p = Runtime.getRuntime().exec(PATH_PROCESS+"graph.sh  " + fortranRequest + " " + timeInMillis + ""); 
     67            Process p = Runtime.getRuntime().exec(PATH_PROCESS+"graph.sh  " + fortranRequest + " " + transitionUpper  + " " + transitionLower +" " + timeInMillis + ""); 
    6868            //     Process p = Runtime.getRuntime().exec("/home/www/GEISA/graph.sh  " + fortranRequest + " " + timeInMillis + ""); 
    6969 
    … …  
    150150    } 
    151151 
    152    @ControllerMethod(jsonResult = true) 
     152    @ControllerMethod(jsonResult = true) 
    153153    public JSONObject getTransitionByIsotopeNameByTransitionLower( @ParamName("isotopesSelectedNameArray") final String isotopesSelectedName, 
    154154                                                                   @ParamName("geisaSelectedDatabase") final String geisaSelectedDatabase, 
    … …  
    160160        final JSONObject result = new JSONObject(); 
    161161        try 
    162        { 
     162        { 
     163         //le passage de javascript à java par ajax transforme les + en espace donc (dans initGeisa-script.jsp) transformation des + en plus et dans le controller on fait l'inverse 
     164            final String replacedTransitionLower = transitionLower.replaceAll( "plus", "+" ); 
    163165            final List<String> isotopesSelectedNameList = Arrays.asList( isotopesSelectedName.split( "," ) ); 
    164             final Set<String> transitionsUpperBis = _geisaService.getTransitionsUpperByTransitionLower( geisaSelectedDatabase, isotopesSelectedNameList, spectralRangeLower, spectralRangeUpper, transitionLower ); 
     166            final Set<String> transitionsUpperBis = _geisaService.getTransitionsUpperByTransitionLower( geisaSelectedDatabase, isotopesSelectedNameList, spectralRangeLower, spectralRangeUpper, replacedTransitionLower ); 
    165167            result.put( "transitionsUpperBis", transitionsUpperBis ); 
    166168        } 
    167169        catch( ServiceException e ) 
    168        { 
     170        { 
    169171            throw new WebException( WebException.WebCode.ISOTOPE_NOT_FOUND, e ); 
    170172        } 
    … …  
    183185        final JSONObject result = new JSONObject(); 
    184186        try 
    185        { 
     187        { 
     188            final String replacedTransitionUpper = transitionUpper.replaceAll( "plus", "+" ); 
    186189            final List<String> isotopesSelectedNameList = Arrays.asList( isotopesSelectedName.split( "," ) ); 
    187             final Set<String> transitionsLowerBis = _geisaService.getTransitionsUpperByTransitionUpper( geisaSelectedDatabase, isotopesSelectedNameList, spectralRangeLower, spectralRangeUpper, transitionUpper ); 
     190            final Set<String> transitionsLowerBis = _geisaService.getTransitionsUpperByTransitionUpper( geisaSelectedDatabase, isotopesSelectedNameList, spectralRangeLower, spectralRangeUpper, replacedTransitionUpper ); 
    188191            result.put( "transitionsLowerBis", transitionsLowerBis ); 
    189192        } 
    190193        catch( ServiceException e ) 
    191        { 
     194        { 
    192195            throw new WebException( WebException.WebCode.ISOTOPE_NOT_FOUND, e ); 
    193196        } 
    … …  
    211214    public static final String PATH_IMAGES = "resources/images/graphGeisa/"; 
    212215    public static final String LONG_PATH_IMAGES = "/home_local/npipsl/workspaces/GEISA/web/resources/images/graphGeisa/"; 
    213      //  naboo 
    214      // public static final String LONG_PATH_IMAGES = "/usr/local/apache-tomcat/webapps/geisa/resources/images/graphGeisa/"; 
     216    //  naboo 
     217    // public static final String LONG_PATH_IMAGES = "/usr/local/apache-tomcat/webapps/geisa/resources/images/graphGeisa/"; 
    215218    public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/"; 
    216219    //naboo 
    217    // public static final String PATH_PROCESS = "/home/www/GEISA/"; 
     220    // public static final String PATH_PROCESS = "/home/www/GEISA/"; 
    218221    private static final String VIEW_INIT = "init"; 
    219222    private static final String VIEW_INIT2 = "initGeisa"; 
Note: See TracChangeset for help on using the changeset viewer.