diff -urN pmbbo/pmb/catalog/catalog.inc.php pmb/catalog/catalog.inc.php --- pmbbo/pmb/catalog/catalog.inc.php 2007-03-11 09:07:42.000000000 +0100 +++ pmb/catalog/catalog.inc.php 2008-05-08 14:51:14.000000000 +0200 @@ -37,7 +37,12 @@ if ($pmb_prefill_cote) require_once("./catalog/expl/$pmb_prefill_cote"); else require_once("./catalog/expl/custom_no_cote.inc.php"); -switch($categ) { +switch($categ) { +//-------------------------------------> L L I U R E X <-------------------------------------- + case 'tejuelo': + include('./tejuelo.php'); + break; +//-------------------------------------> L L I U R E X <-------------------------------------- case 'update': include('./catalog/notices/update_notice.inc.php'); break; @@ -85,7 +90,7 @@ break; case 'etagere': include('./catalog/etagere/main.inc.php'); - break; + break; case 'z3950': if ($z3950_accessible) { // ménage dans les trucs un peu vieux qui ont été remontés diff -urN pmbbo/pmb/edit/fiche_catalographique.inc.php pmb/edit/fiche_catalographique.inc.php --- pmbbo/pmb/edit/fiche_catalographique.inc.php 2007-03-10 10:25:48.000000000 +0100 +++ pmb/edit/fiche_catalographique.inc.php 2008-04-28 13:54:32.000000000 +0200 @@ -1,15 +1,9 @@ id_notice); -$index=new indexint($notice->indexint); -$length=125; // length of catalographic card -$width=76; // width of catalographic card -$height=5; // heigth of a line in a catalographic card + +$length=210; // length of catalographic card +$width=297; // width of catalographic card +$height=4; // heigth of a line in a catalographic card $header=""; // header of the catalographic card class FPDF_Catalog extends FPDF @@ -35,7 +28,7 @@ $this->FPDF("P", "mm", array($length,$width)); $this->Open(); - $this->setMargins(5,5,5); + $this->setMargins(4,10,1); $this->setAutoPageBreak(true,$height); $this->setDisplayMode(125); $this->setTiTle("Fiche catalographique de l'exemplaire :".$expl_cb); @@ -53,242 +46,56 @@ global $length; global $height; global $exemplaire; - global $index; global $pmb_pdf_font; $this->setFont($pmb_pdf_font,"B",10); $this->Cell($length,$height,$header); - $this->Ln(); - $this->Cell($length/2,$height,$exemplaire->cote); - $this->Cell($length/2,$height,$index->name); - $this->Ln(); - } - - - function Body() { - /*---------------------------------------------------------* - ! Create the body of the catalographic card ! - *---------------------------------------------------------*/ - - global $width; - global $length; - global $height; - global $exemplaire; - global $notice; - global $auteur; - global $pmb_pdf_font; - - $body=""; - $body=$body.$notice->tit1." : "; - - /* book title(s) */ - if (strlen($notice->tit2)>0) { - $body=$body.$notice->tit2. " : "; - if (strlen($notice->tit3)>0) { - $body=$body.$notice->tit3. " : "; - if (strlen($notice->tit4)>0) { - $body=$body.$notice->tit4. " : "; - } - } - } - $body=pmb_substr($body,0,pmb_strlen($body)-3)." / "; - - /* book author(s) */ - for($i=0;$iresponsabilites["auteurs"]);$i++) { - unset($auteur); - $auteur=new auteur($notice->responsabilites["auteurs"][$i]["id"]); - $body=$body.$auteur->name; - if ($auteur->rejete) $body=$body." ".$auteur->rejete; - $body=$body.", "; - } - $body=pmb_substr($body,0,pmb_strlen($body)-2).". -"; - - /* book editor(s) */ - if (strlen($notice->ed1)>0) { - $body=$body.$notice->ed1. ", "; - if (strlen($notice->ed2)>0) { - $body=$body.$notice->ed2. ", "; - if (strlen($notice->ed3)>0) { - $body=$body.$notice->ed3. ", "; - if (strlen($notice->ed4)>0) { - $body=$body.$notice->ed4. ", "; - } - } - } - } - $body=pmb_substr($body,0,pmb_strlen($body)-2); - if (strlen($notice->year)>0) $body=$body." :".$notice->year; - $body=$body.". -"; - - /* book format */ - if ($notice->npages) { - $body=$body.$notice->npages; - if ($notice->size) $body=$body."; ".$notice->size; - $body=$body.". -"; - } - - /* book collection */ - if (strlen($notice->coll)>0) { - $body=$body."(".$notice->coll; - if (strlen($notice->nocoll)>0) - $body=$body."; ".$notice->nocoll; - $body=$body."). -"; - } - - /* book note */ - if (strlen(trim($notice->n_contenu))>0) { - $body=$body.trim($notice->n_contenu).". -"; - } - + $this->Ln(); + $matriz=explode( " ",$exemplaire->cote); + $this->Cell($length,$height,$matriz[0]); + $this->Cell($length,$height,$header); + $this->Ln(); + $this->setFont('barcode',"",20); $this->Cell($length-175,$height-256,$header); + $this->Cell(20,0,"*".$exemplaire->cb."*",0,0,'R'); + $this->setFont($pmb_pdf_font,"B",10); + $this->Cell($length,$height,$header); + $this->Ln(); + $this->Cell($length,$height,$matriz[1]); $this->setFont($pmb_pdf_font,"",10); - $this->Ln(); - $this->MultiCell($length*9/10,$height,$body); - $this->Cell($length,$height,"ISBN : ".$notice->code); - } - - function Footer() { - /*---------------------------------------------------------* - ! Create the footer of the catalographic card ! - *---------------------------------------------------------*/ - - global $width; - global $length; - global $height; - global $exemplaire; - global $pmb_pdf_fontfixed; - - $this->setFont($pmb_pdf_fontfixed,"",10); - $this->setXY(5,$width-$height*2); - $this->Cell($length,$height,$exemplaire->cb); - - $this->setFont('barcode',"",20); - $this->setXY(40,$width-7); - // Cell(float w [, float h [, string txt [, mixed border [, int ln [, string align [, int fill [, mixed link]]]]]]]) - $this->Cell(80,0,"*".$exemplaire->cb."*",0,0,'R'); - } - -} - -class UFPDF_Catalog extends UFPDF -{ - function create() { - /*---------------------------------------------------------* - ! Create the catalographic card ! - *---------------------------------------------------------*/ - - global $width, $height ; - global $length; - global $expl_cb; - - $this->FPDF("P", "mm", array($length,$width)); - $this->Open(); - $this->setMargins(5,5,5); - $this->setAutoPageBreak(true,$height); - $this->setDisplayMode(125); - $this->setTiTle("Fiche catalograhique de l'exemplaire :".$expl_cb); - $this->setAuthor("PMB"); - $this->setCreator("PMB"); - } - - function Header() { -/*---------------------------------------------------------* - ! Create the header of the catalographic card ! - *---------------------------------------------------------*/ - - global $header; - global $width; - global $length; - global $height; - global $exemplaire; - global $index; - global $pmb_pdf_font; - - $this->setFont($pmb_pdf_font,"B",10); $this->Cell($length,$height,$header); + $this->Ln(); + $this->Cell(27,0); + $this->Cell(20,0,$exemplaire->cb,0,0,'R'); + $this->setFont($pmb_pdf_font,"B",10); + $this->Cell($length,$height,$header); $this->Ln(); - $this->Cell($length/2,$height,$exemplaire->cote); - $this->Cell($length/2,$height,$index->name); - $this->Ln(); + $this->Cell($length,$height,$matriz[2]); + + + // $this->Ln() } function Body() { /*---------------------------------------------------------* ! Create the body of the catalographic card ! - *---------------------------------------------------------*/ +2 *---------------------------------------------------------*/ global $width; global $length; global $height; global $exemplaire; - global $notice; - global $auteur; global $pmb_pdf_font; $body=""; - $body=$body.$notice->tit1." : "; - /* book title(s) */ - if (strlen($notice->tit2)>0) { - $body=$body.$notice->tit2. " : "; - if (strlen($notice->tit3)>0) { - $body=$body.$notice->tit3. " : "; - if (strlen($notice->tit4)>0) { - $body=$body.$notice->tit4. " : "; - } - } - } - $body=pmb_substr($body,0,pmb_strlen($body)-3)." / "; - - /* book author(s) */ - for($i=0;$iresponsabilites["auteurs"]);$i++) { - unset($auteur); - $auteur=new auteur($notice->responsabilites["auteurs"][$i]["id"]); - $body=$body.$auteur->name. ", "; - } - $body=pmb_substr($body,0,pmb_strlen($body)-2).". -"; - - /* book editor(s) */ - if (strlen($notice->ed1)>0) { - $body=$body.$notice->ed1. ", "; - if (strlen($notice->ed2)>0) { - $body=$body.$notice->ed2. ", "; - if (strlen($notice->ed3)>0) { - $body=$body.$notice->ed3. ", "; - if (strlen($notice->ed4)>0) { - $body=$body.$notice->ed4. ", "; - } - } - } - } - $body=pmb_substr($body,0,pmb_strlen($body)-2); - if (strlen($notice->year)>0) $body=$body." :".$notice->year; - $body=$body.". -"; - - /* book format */ - if (strlen($notice->npage)>0) { - $body=$body.$notice->npage; - if (strlen($notice->size)>0) $body=$body."; ".$notice->size; - $body=$body.". -"; - } - - /* book collection */ - if (strlen($notice->coll)>0) { - $body=$body."(".$notice->coll; - if (strlen($notice->nocoll)>0) - $body=$body."; ".$notice->nocoll; - $body=$body."). -"; - } - /* book note */ - if (strlen(trim($notice->n_contenu))>0) { - $body=$body.trim($notice->n_contenu).". -"; - } + /* book note */ $this->setFont($pmb_pdf_font,"",10); - $this->Ln(); - $this->MultiCell($length*9/10,$height,$body); - $this->Cell($length,$height,"ISBN : ".$notice->code); + // $this->Ln() + $this->MultiCell(10,$height,$body); + } function Footer() { @@ -300,16 +107,25 @@ global $length; global $height; global $exemplaire; - global $pmb_pdf_font; + global $pmb_pdf_fontfixed; + +/* $this->setFont($pmb_pdf_font,"B",10); + $this->Cell($length,$height,$header); + $this->Ln(); + $this->Cell($length,$height,$matriz[2]); - $this->setFont($pmb_pdf_font,"",10); - $this->setXY(5,$width-$height*2); + $this->setFont($pmb_pdf_fontfixed,"",10); + $this->Cell($length-30,$height-35,$header);; $this->Cell($length,$height,$exemplaire->cb); +*/ +// $this->setFont('barcode',"",20); +// $this->setXY(40,$width-7); +// $this->Cell(20,0,"*".$exemplaire->cb."*",0,0,'R'); } } - + /* Create the PDF catalographic card */ $nom_classe=$fpdf."_Catalog"; @@ -320,14 +136,12 @@ /* Create a catalographic card for each author */ for($i=0;$iresponsabilites["auteurs"]);$i++) { unset($auteur); - $auteur=new auteur($notice->responsabilites["auteurs"][$i]["id"]); - $header=$auteur->name; $card->addPage(); $card->Body(); } /* Create a catalographic card for the index */ -$header=$index->name; + $card->addPage(); $card->Body(); $card->output(); diff -urN pmbbo/pmb/includes/messages/es_ES.xml pmb/includes/messages/es_ES.xml --- pmbbo/pmb/includes/messages/es_ES.xml 2008-05-09 14:31:29.000000000 +0200 +++ pmb/includes/messages/es_ES.xml 2008-05-08 14:13:08.000000000 +0200 @@ -3338,5 +3338,7 @@ No tienes ningun usuario en la base de datos, por favor verifiquelo Seleccione un archivo de texto y pulse Enter Separador de campos -Exportar usuarios a un fichero de texto - \ No newline at end of file +Exportar usuarios a un fichero de texto +Para realizar etiquetas, tiene que poner los códigos del ejemplar separados por comas, o bien separados por guiones si quiere acotar dos numeros (NO TIENE QUE HABER ESPACIOS ENTRE LOS CÓDIGOS) +Tejuelo - Etiquetas + diff -urN pmbbo/pmb/includes/messages/va_ES.xml pmb/includes/messages/va_ES.xml --- pmbbo/pmb/includes/messages/va_ES.xml 2008-05-09 14:31:29.000000000 +0200 +++ pmb/includes/messages/va_ES.xml 2008-05-08 14:12:53.000000000 +0200 @@ -3338,5 +3338,7 @@ No teniu cap usuari en la base de dades, comproveu-ho Seleccioneu un arxiu de text i premeu Enter Separador de camps -Exporta usuaris a un fitxer de text +Exporta usuaris a un fitxer de text +Para realizar etiquetas, tiene que poner los códigos del ejemplar separados por comas, o bien separados por guiones si quiere acotar dos numeros (NO TIENE QUE HABER ESPACIOS ENTRE LOS CÓDIGOS) +Tejuelo - Etiquetas diff -urN pmbbo/pmb/includes/templates/catalog.tpl.php pmb/includes/templates/catalog.tpl.php --- pmbbo/pmb/includes/templates/catalog.tpl.php 2007-07-14 09:11:58.000000000 +0200 +++ pmb/includes/templates/catalog.tpl.php 2008-05-08 14:32:34.000000000 +0200 @@ -8,7 +8,8 @@ // $catalog_menu : menu page catalogage -// ancien début de catalog_menu

$msg[129]

+// ancien début de catalog_menu

$msg[129]

+//-------------------------------------> L L I U R E X <-------------------------------------- $catalog_menu = "