Ajustes acordados na reunião de sexta feira dia 16/03/12

diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml
index 682a3c9..be7ab4d 100644 (file)
--- a/src/conf/persistence.xml
+++ b/src/conf/persistence.xml
@@ -22,7 +22,7 @@
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <properties>
       <property name="hibernate.hbm2ddl.auto" value="update"/>
-      <property name="hibernate.show_sql" value="true"/>
+      <property name="hibernate.show_sql" value="false"/>
       <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
     </properties>
   </persistence-unit>

diff --git a/src/java/org/ufcspa/simdecs/comunicacao/MetodoIniciaCaso.java b/src/java/org/ufcspa/simdecs/comunicacao/MetodoIniciaCaso.java
index 72b1c75..805857a 100644 (file)
--- a/src/java/org/ufcspa/simdecs/comunicacao/MetodoIniciaCaso.java
+++ b/src/java/org/ufcspa/simdecs/comunicacao/MetodoIniciaCaso.java
@@ -103,6 +103,8 @@ public class MetodoIniciaCaso extends HttpServlet {
 
                         if (returnResposta.substring(0,1).equals(returnResposta.substring(0,1).toLowerCase()))
                             return returnResposta.substring(0,1).toUpperCase() + returnResposta.substring(1);
+                        else
+                            return returnResposta;
                         
                     }
                 }
@@ -170,7 +172,7 @@ public class MetodoIniciaCaso extends HttpServlet {
                     if (!nodo.getNodo().getTipo().equals(Nodo.SINAL_SINTOMA) && !nodo.getNodo().getTipo().equals(Nodo.HISTORICO))
                         continue;
                 
-                    out.println("                <sintoma uid=\"sintoma-" + nodo.getId() + "\" nomeCientifico=\"" + nodo.getNodo().getNome() + "\" nomePopular=\"" + getPerguntaNodo(nodo.getNodo().getId()) + "\" imagem=\"\" som=\"\" video=\"\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" falaPaciente=\"" + getRespostaNodo(nodo.getNodo(), paciente)  + "\" />");
+                    out.println("                <sintoma uid=\"sintoma-np-" + nodo.getId() + "\" nomeCientifico=\"" + nodo.getNodo().getNome() + "\" nomePopular=\"" + getPerguntaNodo(nodo.getNodo().getId()) + "\" imagem=\"\" som=\"\" video=\"\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" falaPaciente=\"" + getRespostaNodo(nodo.getNodo(), paciente)  + "\" />");
                 }
 
                 // Sinais e sintomas inativos
@@ -182,7 +184,7 @@ public class MetodoIniciaCaso extends HttpServlet {
                     if (!nodo.getTipo().equals(Nodo.SINAL_SINTOMA) && !nodo.getTipo().equals(Nodo.HISTORICO))
                         continue;
                 
-                    out.println("                <sintoma uid=\"sintoma-" + nodo.getId() + "\" nomeCientifico=\"" + nodo.getNome() + "\" nomePopular=\"" + getPerguntaNodo(nodo.getId()) + "\" imagem=\"\" som=\"\" video=\"\" dependencia=\"" + getDependencia(nodo.getId()) + "\" falaPaciente=\"" + getRespostaNodo(nodo, paciente)  + "\" />");
+                    out.println("                <sintoma uid=\"sintoma-nd-" + nodo.getId() + "\" nomeCientifico=\"" + nodo.getNome() + "\" nomePopular=\"" + getPerguntaNodo(nodo.getId()) + "\" imagem=\"\" som=\"\" video=\"\" dependencia=\"" + getDependencia(nodo.getId()) + "\" falaPaciente=\"" + getRespostaNodo(nodo, paciente)  + "\" />");
                 }
                 
                 out.println("            </perguntar_sintoma>");
@@ -193,7 +195,7 @@ public class MetodoIniciaCaso extends HttpServlet {
                     if (!nodo.getNodo().getTipo().equals(Nodo.EXAME_FISICO))
                         continue;
                 
-                    out.println("                <exame_fisico uid=\"exame-fisico-" + nodo.getId() + "\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" descricao=\"" + nodo.getNodo().getNomeAmigavel() + "\" resultado=\"\" imagem=\"\" som=\"\" video=\"\" />");
+                    out.println("                <exame_fisico uid=\"exame-fisico-np-" + nodo.getId() + "\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" descricao=\"" + nodo.getNodo().getNomeAmigavel() + "\" resultado=\"\" imagem=\"\" som=\"\" video=\"\" />");
                 }
                 out.println("            </realiza_exame_fisico>");
 
@@ -203,7 +205,7 @@ public class MetodoIniciaCaso extends HttpServlet {
                     if (!nodo.getNodo().getTipo().equals(Nodo.EXAME_COMPLEMENTAR))
                         continue;
                 
-                    out.println("                <exame_complementar uid=\"exame-complementar-" + nodo.getId() + "\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" descricao=\"" + nodo.getNodo().getNomeAmigavel() + "\" resultado=\"\" imagem=\"\" som=\"\" video=\"\" />");
+                    out.println("                <exame_complementar uid=\"exame-complementar-np-" + nodo.getId() + "\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" descricao=\"" + nodo.getNodo().getNomeAmigavel() + "\" resultado=\"\" imagem=\"\" som=\"\" video=\"\" />");
                 }
                 out.println("            </solicitar_exames_complementar>");
 /*

diff --git a/src/java/org/ufcspa/simdecs/util/UnBUtil.java b/src/java/org/ufcspa/simdecs/util/UnBUtil.java
index 495ef1e..8b3e252 100644 (file)
--- a/src/java/org/ufcspa/simdecs/util/UnBUtil.java
+++ b/src/java/org/ufcspa/simdecs/util/UnBUtil.java
@@ -36,7 +36,6 @@ public class UnBUtil {
         try {
             // required to run unbbayes gui classes on server
             System.setProperty("java.awt.headless", "false"); 
-            System.out.println("REDE: " + redeEntity.getArquivo());
             rede = new ProbabilisticNetwork(null);
             XMLBIFIO.loadXML(new File(redeEntity.getArquivo()), rede);
 

diff --git a/web/login.xhtml b/web/login.xhtml
index 3ee2118..891c589 100644 (file)
--- a/web/login.xhtml
+++ b/web/login.xhtml
@@ -33,7 +33,7 @@
             </p:panel>
             <br/>
             <br/>
-            <h:outputText value="Versão 2.0.3" />
+            <h:outputText value="Versão 2.1.0" />
         </center>
     </h:body>
 </html>