From 2a54a2a87a8def5b6ad77631ea0013540bf4b9c9 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Mon, 22 Apr 2019 20:21:15 -0500
Subject: [PATCH] carga con anio y busqueda por autor tambien ok

---
 .../f023e6c8-25c3-4908-9493-a5e68df73783.xml  |   2 +-
 .../_src_/schema/portal_editorial.tE3KQQ.zip  | Bin 6008 -> 6009 bytes
 .idea/workspace.xml                           |  81 ++++++++++++------
 funciones/carga.php                           |   6 +-
 sql/conexion.php                              |  11 +--
 5 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783.xml b/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783.xml
index 2fa2f35..8ae4095 100644
--- a/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783.xml
+++ b/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783.xml
@@ -1225,7 +1225,7 @@
       <Position>7</Position>
       <DataType>varchar(150)|0s</DataType>
     </argument>
-    <argument id="304" parent="260" name="anio">
+    <argument id="304" parent="260" name="year">
       <Position>8</Position>
       <DataType>varchar(10)|0s</DataType>
     </argument>
diff --git a/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783/storage_v2/_src_/schema/portal_editorial.tE3KQQ.zip b/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783/storage_v2/_src_/schema/portal_editorial.tE3KQQ.zip
index d01badcdfdeefc085a4bb2ef50d3bf8c5e49b789..c55cc2f049ffb7c3e916bacef66920d6e7913327 100644
GIT binary patch
delta 322
zcmeyN_ft<iz?+$civa|_&zt6#y;582F_8Uu@<vYK$^ML@6YY0$8Je3KnHpJ`nww8%
zWYpsYsZ08KbgBXq1B1fke0Igj0{rZgQy8zaRHh~tZMJ99Vg$1$H*l(Kp2+OX4c37$
z`61tP4wxB}FYt>osWDD=WK^5XCvcjngL$$ci~QtY0=7(IEI_8x<Y+-lrj0C<3t3er
ze_&ymyid@JDU21!RiA7q<i+H`2GlAuc>+88<OM>9nIhStT&~I8!uy$Kb58c<Ql6YI
z;>c(;d80@Q(+#f46S<`)8;J%mm2m@^a+4Q{`Y?s@OfKY+o6IL>!gLeFl$snTX3pfx
f3$#Uiay_r;<ilcqOg~{<!O7O*=4>bVKtToo!jxkC

delta 288
zcmeyV_d`!Qz?+$civa{wrcd)L>ACss5s(eSs*@cVRVLc+<TNrgH8V6ZH!z&c#Hcq}
zfrW)L`}4b>3QP<P3X==i6(`3r-eXD3%go>Gz@)_pW=(G7RM|X<*_oRc#n8!*_?~ls
zL_qo{U*s2KQe~W6CnN(jfon3qz-h+z$+rb!nM7G8-w}|X94TnSw1H*vSr(1S`vtw2
zLRo=KmC5=-zKr&hYlWUOMX&?)Do^edKEyPObFv?o^5g;$M<zoqAX9DfO%Yqh>yyPr
za~Mk}w}@slhEDz<8q9bDNJ>wR7c*z_;RTu|KDmKcbn+1~Kc*iruHa-FadWm4e4qdU
E0D9_N<p2Nx

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa714f4..cacd261 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b925d8f-3741-4302-aa30-691568703891" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a/storage_v2/_src_/schema/P_orion_Portal_editorial.XTCG3A.zip" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a/storage_v2/_src_/schema/P_orion_Portal_editorial.XTCG3A.zip" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sql/base.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sql/base.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783/storage_v2/_src_/schema/portal_editorial.tE3KQQ.zip" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/f023e6c8-25c3-4908-9493-a5e68df73783/storage_v2/_src_/schema/portal_editorial.tE3KQQ.zip" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/funciones/carga.php" beforeDir="false" afterPath="$PROJECT_DIR$/funciones/carga.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sql/conexion.php" beforeDir="false" afterPath="$PROJECT_DIR$/sql/conexion.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -45,11 +46,29 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/sql/base.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="184">
-              <caret line="80" column="216" selection-start-line="80" selection-start-column="216" selection-end-line="80" selection-end-column="216" />
+            <state relative-caret-position="308">
+              <caret line="82" column="36" lean-forward="true" selection-start-line="82" selection-start-column="36" selection-end-line="82" selection-end-column="36" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/funciones/carga.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-2630">
+              <caret line="7" column="49" selection-start-line="7" selection-start-column="49" selection-end-line="7" selection-end-column="49" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/sql/conexion.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="286">
+              <caret line="13" column="27" lean-forward="true" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
             </state>
           </provider>
         </entry>
@@ -169,8 +188,6 @@
         <option value="$PROJECT_DIR$/index.php" />
         <option value="$PROJECT_DIR$/pagina/lineamientos.html" />
         <option value="$PROJECT_DIR$/componentes/similares.php" />
-        <option value="$PROJECT_DIR$/sql/conexion.php" />
-        <option value="$PROJECT_DIR$/funciones/carga.php" />
         <option value="$PROJECT_DIR$/pagina/admin.php" />
         <option value="$PROJECT_DIR$/pagina/carga.php" />
         <option value="$PROJECT_DIR$/componentes/socialmedia.php" />
@@ -184,6 +201,8 @@
         <option value="$PROJECT_DIR$/pagina/resultado.php" />
         <option value="$PROJECT_DIR$/pagina/sinresultado.php" />
         <option value="$PROJECT_DIR$/sql/base.sql" />
+        <option value="$PROJECT_DIR$/funciones/carga.php" />
+        <option value="$PROJECT_DIR$/sql/conexion.php" />
       </list>
     </option>
   </component>
@@ -220,6 +239,16 @@
               <item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
               <item name="doc" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
+              <item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
+              <item name="funciones" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
+              <item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
+              <item name="img" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
               <item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
@@ -321,12 +350,12 @@
       <workItem from="1554848398409" duration="1249000" />
       <workItem from="1554934333535" duration="634000" />
       <workItem from="1555466329394" duration="1765000" />
-      <workItem from="1555973146343" duration="3456000" />
+      <workItem from="1555973146343" duration="4886000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="303469000" />
+    <option name="totallyTimeSpent" value="304899000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -449,13 +478,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/componentes/similares.php" />
-    <entry file="file://$PROJECT_DIR$/sql/conexion.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="51" selection-start-line="16" selection-start-column="51" selection-end-line="16" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a/console.sql">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="720">
@@ -463,13 +485,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/funciones/carga.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="595">
-          <caret line="137" column="61" selection-start-line="137" selection-start-column="61" selection-end-line="137" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/funciones/destroy.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
@@ -591,10 +606,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/funciones/carga.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2630">
+          <caret line="7" column="49" selection-start-line="7" selection-start-column="49" selection-end-line="7" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/sql/base.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="80" column="216" selection-start-line="80" selection-start-column="216" selection-end-line="80" selection-end-column="216" />
+        <state relative-caret-position="308">
+          <caret line="82" column="36" lean-forward="true" selection-start-line="82" selection-start-column="36" selection-end-line="82" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sql/conexion.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="27" lean-forward="true" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
         </state>
       </provider>
     </entry>
diff --git a/funciones/carga.php b/funciones/carga.php
index 2de8ab3..f00b241 100644
--- a/funciones/carga.php
+++ b/funciones/carga.php
@@ -1,10 +1,10 @@
 <?php
 if(isset($_POST["enviar"])){
     include "../sql/conexion.php";
-    function insertar_datos($titulo,$autor,$categoria,$paginas,$isbn,$precio,$edicion,$tipo,$imagen,$descripcion,$pdf)
+    function insertar_datos($titulo,$autor,$categoria,$paginas,$isbn,$precio,$edicion,$year,$tipo,$imagen,$descripcion,$pdf)
     {
         global $conexion;
-        $sentencia = "CALL st_inserta_libro('$titulo','$autor','$categoria','$paginas','$isbn',$precio,'$edicion',$tipo,'$imagen','$descripcion','$pdf');";
+        $sentencia = "CALL st_inserta_libro('$titulo','$autor','$categoria','$paginas','$isbn',$precio,'$edicion','$year',$tipo,'$imagen','$descripcion','$pdf');";
         $ejecutar = $conexion->query($sentencia);
         if (!$ejecutar) {
             echo "<p><br> <br>Error: " . $conexion->errorInfo(). "<br><br></p>";
@@ -105,7 +105,7 @@ if(isset($_POST["enviar"])){
         //echo "entea";
         $resultado = insertar_datos($csv[$i][0],$csv[$i][1],$csv[$i][2],
         $csv[$i][3],$csv[$i][4],$csv[$i][5],
-        $csv[$i][6],$csv[$i][7],$csv[$i][8],$csv[$i][9],$csv[$i][10]);
+        $csv[$i][6],$csv[$i][7],$csv[$i][8],$csv[$i][9],$csv[$i][10],$csv[$i][10]);
         /*print_r($resultado);
         echo "<br>";
         print_r($i);
diff --git a/sql/conexion.php b/sql/conexion.php
index b43c741..01e3bb8 100644
--- a/sql/conexion.php
+++ b/sql/conexion.php
@@ -3,12 +3,12 @@
 * local
 *
 
+$host = 'localhost';
+$user = 'blender';
+$pass = 'avatares1';
+$dbname = 'portal_editorial';
+$dsn = 'mysql:host=' . $host . ';dbname=' .$dbname;
 
-    $host = 'localhost';
-    $user = 'blender';
-    $pass = 'avatares1';
-    $dbname = 'portal_editorial';
-    $dsn = 'mysql:host=' . $host . ';dbname=' .$dbname;
 */
 $host = '132.248.80.194';
 $user = 'portal_editorial';
@@ -16,6 +16,7 @@ $pass = 'p0rt4l';
 $dbname = 'P_orion_Portal_editorial';
 $dsn = 'mysql:host=' . $host . ';dbname=' .$dbname;
 
+
     try{
 
         $conexion = new PDO($dsn,$user,$pass);