From 1dbb62d21198a6a39a9f7c2e524f041a82fa97d4 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Mon, 22 Apr 2019 19:47:31 -0500
Subject: [PATCH] carga con anio y busqueda por autor tambien1

---
 .../d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml  |   2 +-
 .../P_orion_Portal_editorial.XTCG3A.zip       | Bin 7331 -> 7332 bytes
 .idea/workspace.xml                           |  53 +++++++-----------
 sql/base.sql                                  |   4 +-
 4 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml b/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml
index 746cdbc..5880caa 100644
--- a/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml
+++ b/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml
@@ -1529,7 +1529,7 @@
       <Position>7</Position>
       <DataType>varchar(150)|0s</DataType>
     </argument>
-    <argument id="376" parent="332" name="anio">
+    <argument id="376" parent="332" name="year">
       <Position>8</Position>
       <DataType>varchar(10)|0s</DataType>
     </argument>
diff --git a/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a/storage_v2/_src_/schema/P_orion_Portal_editorial.XTCG3A.zip b/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a/storage_v2/_src_/schema/P_orion_Portal_editorial.XTCG3A.zip
index 3429c3e16fa49fd7b8098cb22f28ad1a405b9b26..beeb296335a6993ab1a8f06ff9045f9cfc632d34 100644
GIT binary patch
delta 696
zcmZ2%xx`XBz?+$civa{~%$??!y;582F^~<ys*@cURVLc+<T5ljH8M4_Ff})y%*d$6
z3sRT#^XOCsCI$wD$p!3+lM{rwCZ{uAVW~__EZS_(q{RqkO>X2=VFoIm%*;ClOwZz7
z45l6UW`pT_e0Rb0KK=$U?I=*lbYt%1$;>?<N|9wISahqvN-&)$c$5p_)X95T76Vmn
zPGp_VF3!j#!hppOlWm2bE1<X*=wcP1&lUnP1gJ4ic4SnWoF%*#Y)6!&G*buj<hzo}
zlV?dPgM|(Nh2&X)Latz=CdI_%Cj<3@uq+TOLCgV?M_DHO^T|(6l+pt$d?V|AY#C4(
zgk^vjp)i?s@_H#Bu;Krtq?w%ACI<*eO*WO50_zL?A3xI?s2+r+ff(X1AcNr;NTKZH
z9%(U9@JNctFj=urHe`{X93~<U)_O7gSZyp&AqXn~F+UJPzzL8-rODexq`?ZeBpAO-
z0m^`|77&BN1Ok#dCKs}bPrfZ6I{BTn0oaX-GSW=^oKRuG$!Rj0lh=!Kfz2t946RE9
zY6M|5AXWfk2)GZ@pfdRb3(I6FQ5}$bJw#=gTDX9s>XUm#y_oX2Cm$43p8QAjFjEH)
pkolD96dy1uWF{XGKgINzAIw}Mu~3AS4P>AY5M}~HLRARF0|1e&!`c7<

delta 706
zcmZ2tx!6)Xz?+$civa{)O`GOd(sT3MBOv?H<cEBUlj9iKC))4iG%_?bGc++bFr3W9
zsK*OZmi_tNPX#6h28GG<c|gkUu_WeY=5Kaj(qaU&CU4+VVR}7nvKxC3h`Pc)6GXk{
zTnwZ(PvDx)KKTqE4`<==^BN&Q%R+#b2~S=lB0Bjva}x8-(w50OEQ`VPC6?J>x`6dA
zm=0iT0MnP*3L)YgE5Wo3=TUJ+CJ_c~9<dX8u7KiZpu1Iowk`x>2vB9594MqbIYW4Z
z!fT-CjxKH~^9Ra+up$uiLsS9DcIL?s#pEY15|aljycmA0HWnxh!U{l)P$<d*RA>uU
zR3I5zmk5*uVKpFD0AdK(z%qFOm&)Ww2?J2zbW6xEg|Y%g)F)q%@M5xO1G-6O@&O+9
z$@Y?mnIhT2Tm`9<OtU$`%=gmllli0%Gi~95au-hK6X61fhO~$@(>I>U^F)*<M~f(f
zg&KiEy}UpnR|R1B`b~<7%TETn0)%COSP9}HAZg4u`5}w^WF=8Ou);U8?#Gq^g+W*b
zh!F}ef)q+m?iMu!Td-eLnrS2dWCJm&$=^h!z<NXf$Ir9|>H%SCAcjN^kilRg090rU
z)~6^g&9p)Q=xy=I(>O#YXNenth35i=Lj<A1f|DPKYl^V4fwT$%VJ6Td6(JB00QMcs
AZvX%Q

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c2ef4db..fa714f4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,6 @@
     <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$/.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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/componentes/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/componentes/header.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pagina/categoria.php" beforeDir="false" afterPath="$PROJECT_DIR$/pagina/categoria.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pagina/libro.php" beforeDir="false" afterPath="$PROJECT_DIR$/pagina/libro.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pagina/resultado.php" beforeDir="false" afterPath="$PROJECT_DIR$/pagina/resultado.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pagina/sinresultado.php" beforeDir="false" afterPath="$PROJECT_DIR$/pagina/sinresultado.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/sql/base.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sql/base.sql" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -53,11 +45,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/sql/base.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" />
+            <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>
           </provider>
         </entry>
@@ -96,11 +88,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pagina/sinresultado.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="66" column="30" selection-start-line="66" selection-start-column="30" selection-end-line="66" selection-end-column="30" />
+            <state relative-caret-position="242">
+              <caret line="59" column="26" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="26" />
             </state>
           </provider>
         </entry>
@@ -186,12 +178,12 @@
         <option value="$PROJECT_DIR$/css/estilo.css" />
         <option value="$PROJECT_DIR$/pagina/lineamiento.html" />
         <option value="$PROJECT_DIR$/componentes/footer.php" />
-        <option value="$PROJECT_DIR$/sql/base.sql" />
         <option value="$PROJECT_DIR$/componentes/header.php" />
         <option value="$PROJECT_DIR$/pagina/categoria.php" />
         <option value="$PROJECT_DIR$/pagina/libro.php" />
         <option value="$PROJECT_DIR$/pagina/resultado.php" />
         <option value="$PROJECT_DIR$/pagina/sinresultado.php" />
+        <option value="$PROJECT_DIR$/sql/base.sql" />
       </list>
     </option>
   </component>
@@ -228,11 +220,6 @@
               <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="pagina" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
               <item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
@@ -334,21 +321,21 @@
       <workItem from="1554848398409" duration="1249000" />
       <workItem from="1554934333535" duration="634000" />
       <workItem from="1555466329394" duration="1765000" />
-      <workItem from="1555973146343" duration="1717000" />
+      <workItem from="1555973146343" duration="3456000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="301730000" />
+    <option name="totallyTimeSpent" value="303469000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Favorites" order="0" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="1" sideWeight="0.49942988" visible="true" weight="0.1407767" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.49942988" visible="true" weight="0.1407767" />
       <window_info id="Structure" order="2" sideWeight="0.5005701" side_tool="true" weight="0.15291262" />
-      <window_info anchor="bottom" id="Database Console" order="0" visible="true" weight="0.41619155" />
+      <window_info active="true" anchor="bottom" id="Database Console" order="0" visible="true" weight="0.41619155" />
       <window_info anchor="bottom" id="Terminal" order="1" weight="0.3279483" />
       <window_info anchor="bottom" id="Database Changes" order="2" weight="0.32956383" />
       <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" weight="0.3295325" />
@@ -555,13 +542,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/sql/base.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/funciones/libro.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="134">
@@ -606,8 +586,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pagina/sinresultado.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="66" column="30" selection-start-line="66" selection-start-column="30" selection-end-line="66" selection-end-column="30" />
+        <state relative-caret-position="242">
+          <caret line="59" column="26" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="26" />
+        </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>
       </provider>
     </entry>
diff --git a/sql/base.sql b/sql/base.sql
index 851dd01..ace0915 100644
--- a/sql/base.sql
+++ b/sql/base.sql
@@ -78,10 +78,10 @@ INSERT INTO usuario VALUES(id_usuario,nombre,user,password,tipo) ,(NULL, 'Admini
 
 INSERT INTO tipo_venta VALUES (NULL,'tienda'), (NULL, 'linea'), (NULL, 'ambos');
 
-CREATE PROCEDURE `st_consulta_libro`(IN `tit` VARCHAR(150)) NOT DETERMINISTIC CONTAINS SQL SQ|L SECURITY DEFINER BEGIN SELECT * FROM libro WHERE titulo LIKE CONCAT('%', tit , '%') OR autor LIKE CONCAT('%', tit , '%'); END; DELIMITER ;
+CREATE PROCEDURE `st_consulta_libro`(IN `tit` VARCHAR(150)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro WHERE titulo LIKE CONCAT('%', tit , '%') OR autor LIKE CONCAT('%', tit , '%'); END; DELIMITER ;
 CREATE PROCEDURE `st_consulta_categoria`(IN `cat` VARCHAR(150)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro WHERE categoria LIKE CONCAT('%', cat , '%'); END;
 CREATE PROCEDURE `st_novedades`() NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro ORDER BY anio DESC LIMIT 12; END;
-CREATE PROCEDURE `st_inserta_libro`(IN `tit` VARCHAR(250), `aut` VARCHAR(250),`cat` VARCHAR(150), `pag` VARCHAR(150), `isb` VARCHAR(150), `pre` INT (5), `edi` VARCHAR(150), `anio` VARCHAR(10), `tip` INT(2), `img` VARCHAR(200), `des` VARCHAR(500), `pdfs` VARCHAR(250)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN INSERT INTO libro(id_libro, titulo, autor, categoria, paginas, isbn, precio, edicion, anio, tipo, imagen, descripcion, pdf)values (NULL ,tit,aut,cat,pag,isb,pre,edi,anio,tip,img,des,pdfs); END;
+CREATE PROCEDURE `st_inserta_libro`(IN `tit` VARCHAR(250), `aut` VARCHAR(250),`cat` VARCHAR(150), `pag` VARCHAR(150), `isb` VARCHAR(150), `pre` INT (5), `edi` VARCHAR(150), `year` VARCHAR(10), `tip` INT(2), `img` VARCHAR(200), `des` VARCHAR(500), `pdfs` VARCHAR(250)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN INSERT INTO libro(id_libro, titulo, autor, categoria, paginas, isbn, precio, edicion, anio, tipo, imagen, descripcion, pdf)values (NULL ,tit,aut,cat,pag,isb,pre,edi,year,tip,img,des,pdfs); END;
 CREATE PROCEDURE `st_libro_edicion`() NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro ORDER BY edicion DESC LIMIT 12; END;
 CREATE PROCEDURE `st_menu`() NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM menu; END;
 CREATE PROCEDURE `st_login`(IN `usr` varchar(45), `pass` varchar(45)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT nombre, user, password, tipo FROM usuario WHERE user = usr AND password = pass; END;
\ No newline at end of file