Skip to content

Formatting changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaideraf wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Formatting changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2341826
formatting changes
jaideraf Dec 24, 2024
c9ead8b
Update teses.php
jaideraf Dec 26, 2024
2109cba
Add .gitignore, EditorConfig, and improve code formatting across mult…
jaideraf Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = false
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vendor
5 changes: 5 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"require-dev": {
"squizlabs/php_codesniffer": "*"
}
}
99 changes: 99 additions & 0 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 24 additions & 25 deletions config/pergamum2dspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@

{
"100-a-1":"dc.contributor.author",
"245-a-1":"dc.title",
"260-a-1":"dc.publisher",
"260-c-1":"dc.date.issued",
"300-a-1":"dc.format.extent",
"502-a-1":"dc.description",
"520-a-1":"dc.description.abstract",
"520-a-2":"dc.description.abstract.en",
"650-a-1":"dc.subject.classification",
"650-a-2":"dc.subject.classification",
"650-a-3":"dc.subject.classification",
"650-a-4":"dc.subject.classification",
"650-a-5":"dc.subject.classification",
"650-a-6":"dc.subject.classification",
"650-a-7":"dc.subject.classification",
"650-a-8":"dc.subject.classification",
"650-a-9":"dc.subject.classification",
"700-a-1":"dc.contributor.advisor",
"700-a-2":"dc.contributor.advisor-co",
"710-a-1":"dc.contributor",
"cod_acervo": "dc.identifier.other",
"idioma": "dc.language.iso",
"nota_monog": "dc.type"
}
"100-a-1": "dc.contributor.author",
"245-a-1": "dc.title",
"260-a-1": "dc.publisher",
"260-c-1": "dc.date.issued",
"300-a-1": "dc.format.extent",
"502-a-1": "dc.description",
"520-a-1": "dc.description.abstract",
"520-a-2": "dc.description.abstract.en",
"650-a-1": "dc.subject.classification",
"650-a-2": "dc.subject.classification",
"650-a-3": "dc.subject.classification",
"650-a-4": "dc.subject.classification",
"650-a-5": "dc.subject.classification",
"650-a-6": "dc.subject.classification",
"650-a-7": "dc.subject.classification",
"650-a-8": "dc.subject.classification",
"650-a-9": "dc.subject.classification",
"700-a-1": "dc.contributor.advisor",
"700-a-2": "dc.contributor.advisor-co",
"710-a-1": "dc.contributor",
"cod_acervo": "dc.identifier.other",
"idioma": "dc.language.iso",
"nota_monog": "dc.type"
}
23 changes: 11 additions & 12 deletions config/xls2dspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

{
"B": "dc.identifier.other",
"C":"dc.title",
"D":"dc.description.abstract",
"E":"dc.date.issued",
"G":"dc.subject",
"J":"dc.contributor.author",
"K":"dc.contributor.advisor",
"L":"dc.contributor.other",
"descricao": "dc.description",
"tipo": "dc.type"
}
"B": "dc.identifier.other",
"C": "dc.title",
"D": "dc.description.abstract",
"E": "dc.date.issued",
"G": "dc.subject",
"J": "dc.contributor.author",
"K": "dc.contributor.advisor",
"L": "dc.contributor.other",
"descricao": "dc.description",
"tipo": "dc.type"
}
33 changes: 16 additions & 17 deletions pergamumws/marc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<?
include("parametros.php");
<?php
require "parametros.php";
$color = true;
//$query = sybase_query("select distinct ams.cod_acervo, r.desc_titulo, r.ano_publicacao, t.desc_tipo_obra
//$query = sybase_query("select ams.*, r.*, t.*
#$query = sybase_query("select * from acervo_marc_secao where cod_acervo=$cod_acervo
$cod_acervo = isset($_GET['cod_acervo'])? intval($_GET['cod_acervo']) : 0;
$query = "select * from acervo_marc_secao where cod_acervo=$cod_acervo order by paragrafo, seq_paragrafo";
$result = mssql_query($query,$db);
// $query = sybase_query("select distinct ams.cod_acervo, r.desc_titulo, r.ano_publicacao, t.desc_tipo_obra
// $query = sybase_query("select ams.*, r.*, t.*
// $query = sybase_query("select * from acervo_marc_secao where cod_acervo=$cod_acervo
$cod_acervo = isset($_GET['cod_acervo']) ? intval($_GET['cod_acervo']) : 0;
$query = "SELECT * FROM acervo_marc_secao WHERE cod_acervo=$cod_acervo ORDER BY paragrafo, seq_paragrafo";
$result = mssql_query($query, $db);

$trabalhos = array();
while($array1 = mssql_fetch_assoc($result))
{
$t = array();
foreach($array1 as $k => $v){
$t[$k] = utf8_encode(htmlentities($v, ENT_COMPAT, "ISO-8859-1" ));
#$t[$k] = utf8_encode(htmlentities($v ));
//$t[$k] = $v;
}
$trabalhos[] = $t;
while ($array1 = mssql_fetch_assoc($result)) {
$t = array();
foreach ($array1 as $k => $v) {
$t[$k] = utf8_encode(htmlentities($v, ENT_COMPAT, "ISO-8859-1"));
// $t[$k] = utf8_encode(htmlentities($v ));
// $t[$k] = $v;
}
$trabalhos[] = $t;
}
header('Content-Type: text/javascript; charset=utf8');
echo json_encode($trabalhos);
11 changes: 5 additions & 6 deletions pergamumws/parametros.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?
<?php
error_reporting(32);
$server = "IP:INSTANCEPORT";
$database = "pergamarc";
Expand All @@ -7,9 +7,8 @@

$db = mssql_connect($server, $user, $password) or die('MSSQL error: ' . mssql_get_last_message());

mssql_select_db( $database , $db ) or die ("Problema ao setar o DB do Pergamum: " . mssql_get_last_message());

foreach( $_GET as $key => $value )
$$key = $value;

mssql_select_db($database, $db) or die("Problema ao setar o DB do Pergamum: " . mssql_get_last_message());

foreach ($_GET as $key => $value) {
$$key = $value;
}
84 changes: 43 additions & 41 deletions pergamumws/teses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,51 @@
<?
include("parametros.php");
<?php
require "parametros.php";


$color = true;
$query = mssql_query("select r.*, t.*
from acervo_geral ag, referencia r, tipo_obra t
where ag.cod_sit_acervo='0'
and not exists (select * from acervos_incompletos ai
where ai.cod_acervo = ag.cod_acervo
and ai.cod_tipo_obra = ag.cod_tipo_obra
and ai.cod_empresa = ag.cod_empresa)
and ag.cod_acervo = r.cod_acervo
and ag.cod_empresa = r.cod_empresa
and t.cod_empresa=18
and t.cod_tipo_obra=ag.cod_tipo_obra
and ag.cod_tipo_obra in(6,9)
and (r.ano_publicacao = '".$ano."' or '".$ano."'='' )
and (r.cod_acervo = '".$acervo."' or '".$acervo."'='' )
--and r.ano_publicacao >= '2009' and r.ano_publicacao<='2009'
--and r.cod_acervo=348186
order by r.ano_publicacao desc
",$db);
$query = mssql_query(
"SELECT r.*, t.*
FROM acervo_geral ag, referencia r, tipo_obra t
WHERE ag.cod_sit_acervo = '0'
AND NOT EXISTS (SELECT * FROM acervos_incompletos ai
WHERE ai.cod_acervo = ag.cod_acervo
AND ai.cod_tipo_obra = ag.cod_tipo_obra
AND ai.cod_empresa = ag.cod_empresa)
AND ag.cod_acervo = r.cod_acervo
AND ag.cod_empresa = r.cod_empresa
AND t.cod_empresa = 18
AND t.cod_tipo_obra = ag.cod_tipo_obra
AND ag.cod_tipo_obra in(6,9)
AND (r.ano_publicacao = '" . $ano . "' or '" . $ano . "'='')
AND (r.cod_acervo = '" . $acervo . "' or '" . $acervo . "'='')
-- AND r.ano_publicacao >= '2009' AND r.ano_publicacao <= '2009'
-- AND r.cod_acervo=348186
ORDER BY r.ano_publicacao DESC
",
$db
);
$trabalhos = array();
while($array1 = mssql_fetch_assoc($query))
{
#print_r($array1);
#die("teste");
$t = array();
$url_link = null;
foreach($array1 as $k => $v){
$t[$k] = utf8_encode(htmlentities($v,ENT_COMPAT, "ISO-8859-1" ));
//$t[$k] = utf8_encode(htmlentities($v ));
}
while ($array1 = mssql_fetch_assoc($query)) {
// print_r($array1);
// die("teste");
$t = array();
$url_link = null;
foreach ($array1 as $k => $v) {
$t[$k] = utf8_encode(htmlentities($v, ENT_COMPAT, "ISO-8859-1"));
// $t[$k] = utf8_encode(htmlentities($v ));
}

$link1 = mssql_query("spwper_busca_links856 18,".$t['cod_acervo'],$db);
$link1 = mssql_query("spwper_busca_links856 18," . $t['cod_acervo'], $db);

while($reg_link = @mssql_fetch_array($link1))
{
$url_link = $reg_link["descricao"];
if(trim($url_link)=="")
$url_link = $reg_link["texto_descricao"];
$t['links'] = htmlentities($url_link);
//$t['links'] = $url_link;
}
$trabalhos[] = $t;
while ($reg_link = @mssql_fetch_array($link1)) {
$url_link = $reg_link["descricao"];
if (trim($url_link) == "") {
$url_link = $reg_link["texto_descricao"];
}
$t['links'] = htmlentities($url_link);
// $t['links'] = $url_link;
}
$trabalhos[] = $t;
}
header('Content-Type: text/javascript; charset=utf8');
header('Content-Type: application/json; charset=utf8');
echo json_encode($trabalhos);
Loading