Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitd63805a

Browse files
committed
A little reformatting for better print appearance.
1 parent8e144b0 commitd63805a

File tree

3 files changed

+51
-47
lines changed

3 files changed

+51
-47
lines changed

‎doc/src/sgml/libpq.sgml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.73 2001/10/12 23:32:34 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.74 2001/10/31 20:39:30 petere Exp $
33
-->
44

55
<chapter id="libpq">
@@ -29,11 +29,10 @@ $Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.73 2001/10/12 23:32:34 momji
2929
complete examples of <filename>libpq</filename> applications in the
3030
following directories:
3131

32-
<programlisting>
33-
../src/test/regress
34-
../src/test/examples
35-
../src/bin/psql
36-
</programlisting>
32+
<simplelist>
33+
<member><filename>src/test/examples</filename></member>
34+
<member><filename>src/bin/psql</filename></member>
35+
</simplelist>
3736
</para>
3837

3938
<para>
@@ -382,21 +381,21 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn)
382381
particular order, or at all, or on the status always being one of these
383382
documented values. An application may do something like this:
384383
<programlisting>
385-
switch(PQstatus(conn))
386-
{
387-
case CONNECTION_STARTED:
388-
feedback = "Connecting...";
389-
break;
384+
switch(PQstatus(conn))
385+
{
386+
case CONNECTION_STARTED:
387+
feedback = "Connecting...";
388+
break;
390389

391-
case CONNECTION_MADE:
392-
feedback = "Connected to server...";
393-
break;
390+
case CONNECTION_MADE:
391+
feedback = "Connected to server...";
392+
break;
394393
.
395394
.
396395
.
397-
default:
398-
feedback = "Connecting...";
399-
}
396+
default:
397+
feedback = "Connecting...";
398+
}
400399
</programlisting>
401400
</para>
402401

‎doc/src/sgml/odbc.sgml

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.25 2001/10/09 22:32:32 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.26 2001/10/31 20:39:30 petere Exp $
33
-->
44

55
<chapter id="odbc">
@@ -380,18 +380,18 @@ InstallDir = /opt/applix/axdata/axshlib
380380
At the bottom of <filename>axnet.cnf</filename>,
381381
find the line that starts with
382382

383-
<programlisting>
383+
<programlisting>
384384
#libFor elfodbc /ax/<replaceable>...</replaceable>
385-
</programlisting>
385+
</programlisting>
386386
</para>
387387
</step>
388388
<step performance="required">
389389
<para>
390390
Change line to read
391391

392-
<programlisting>
392+
<programlisting>
393393
libFor elfodbc <replaceable>applixroot</replaceable>/applix/axdata/axshlib/lib
394-
</programlisting>
394+
</programlisting>
395395

396396
which will tell <literal>elfodbc</literal> to look in this directory
397397
for the <acronym>ODBC</acronym> support library.
@@ -410,9 +410,9 @@ libFor elfodbc <replaceable>applixroot</replaceable>/applix/axdata/axshlib/lib
410410
Create <filename>.odbc.ini</filename> as
411411
described above. You may also want to add the flag
412412

413-
<programlisting>
413+
<programlisting>
414414
TextAsLongVarchar=0
415-
</programlisting>
415+
</programlisting>
416416

417417
to the database-specific portion of <filename>.odbc.ini</filename>
418418
so that text fields will not be shown as <literal>**BLOB**</literal>.
@@ -438,34 +438,34 @@ TextAsLongVarchar=0
438438

439439
<step performance="required">
440440
<para>
441-
Select <command>Query->Choose Server</command>.
441+
Select <menuchoice><guimenu>Query</guimenu><guimenuitem>Choose Server</guimenuitem></menuchoice>.
442442
</para>
443443
</step>
444444
<step performance="required">
445445
<para>
446-
Select <acronym>ODBC</acronym>, and click <command>Browse</command>.
446+
Select <guimenuitem>ODBC</guimenuitem>, and click <guibutton>Browse</guibutton>.
447447
The database you configured in <filename>.odbc.ini</filename>
448-
should be shown. Make sure that the <option>Host: field</option>
448+
should be shown. Make sure that the <guilabel>Host:</guilabel> field
449449
is empty (if it is not, <literal>axnet</> will try to contact <literal>axnet</> on another machine
450450
to look for the database).
451451
</para>
452452
</step>
453453
<step performance="required">
454454
<para>
455-
Select the database in the box that was launched by <command>Browse</command>,
456-
then click <command>OK</command>.
455+
Select the database in the box that was launched by <guibutton>Browse</guibutton>,
456+
then click <guibutton>OK</guibutton>.
457457
</para>
458458
</step>
459459
<step performance="required">
460460
<para>
461461
Enter user name and password in the login identification dialog,
462-
and click <command>OK</command>.
462+
and click <guibutton>OK</guibutton>.
463463
</para>
464464
</step>
465465
</substeps>
466466

467467
<para>
468-
You should see <literal>Starting elfodbc server</literal>
468+
You should see <guilabel>Starting elfodbc server</guilabel>
469469
in the lower left corner of the
470470
data window. If you get an error dialog box, see the debugging section
471471
below.
@@ -479,9 +479,12 @@ TextAsLongVarchar=0
479479
</step>
480480
<step performance="required">
481481
<para>
482-
Select a table from Query->Choose tables, and then select Query->Query
483-
to access the database. The first 50 or so rows from the table should
484-
appear.
482+
Select a table from
483+
<menuchoice><guimenu>Query</><guimenuitem>Choose
484+
tables</></menuchoice>, and then select
485+
<menuchoice><guimenu>Query</><guimenuitem>Query</></menuchoice>
486+
to access the database. The first 50 or so rows from the table
487+
should appear.
485488
</para>
486489
</step>
487490
</procedure>
@@ -530,7 +533,7 @@ TextAsLongVarchar=0
530533
<para>
531534
The driver process has terminated due to some other
532535
problem. You might not have an up-to-date version
533-
of the <productname>Postgres</productname>
536+
of the <productname>PostgreSQL</productname>
534537
<acronym>ODBC</acronym> package.
535538
</para>
536539
</listitem>
@@ -595,24 +598,24 @@ TextAsLongVarchar=0
595598
Start an <application>strace</application> on
596599
the <literal>axnet</literal> process. For example, if
597600

598-
<programlisting>
599-
%ps -aucx | grep ax
600-
</programlisting>
601+
<screen>
602+
<prompt>$</prompt> <userinput>ps -aucx | grep ax</userinput>
603+
</screen>
601604

602605
shows
603606

604-
<programlisting>
607+
<screen>
605608
cary 10432 0.0 2.6 1740 392 ? S Oct 9 0:00 axnet
606609
cary 27883 0.9 31.0 12692 4596 ? S 10:24 0:04 axmain
607-
</programlisting>
610+
</screen>
608611
</para>
609612

610613
<para>
611614
Then run
612615

613-
<programlisting>
614-
%strace -f -s 1024 -p 10432
615-
</programlisting>
616+
<screen>
617+
<prompt>$</prompt> <userinput>strace -f -s 1024 -p 10432</userinput>
618+
</screen>
616619
</para>
617620
</step>
618621

@@ -638,14 +641,14 @@ cary 27883 0.9 31.0 12692 4596 ? S 10:24 0:04 axmain
638641
a <literal>Cannot launch gateway on server</literal>,
639642
I ran <command>strace</command> on <literal>axnet</literal> and got
640643

641-
<programlisting>
644+
<screen>
642645
[pid 27947] open("/usr/lib/libodbc.so", O_RDONLY) = -1 ENOENT
643646
(No such file or directory)
644647
[pid 27947] open("/lib/libodbc.so", O_RDONLY) = -1 ENOENT
645648
(No such file or directory)
646649
[pid 27947] write(2, "/usr2/applix/axdata/elfodbc:
647650
can't load library 'libodbc.so'\n", 61) = -1 EIO (I/O error)
648-
</programlisting>
651+
</screen>
649652
So what is happening is that <literal>applix elfodbc</literal> is searching for <filename>libodbc.so</filename>, but it
650653
cannot find it. That is why <filename>axnet.cnf</filename> needed to be changed.
651654
</para>

‎doc/src/sgml/spi.sgml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2821,11 +2821,13 @@ execq(text *sql, int cnt)
28212821
Now, compile and create the function:
28222822

28232823
<ProgramListing>
2824-
CREATE FUNCTION execq (TEXT, INT4) RETURNS INT4 AS '...path_to_so' LANGUAGE 'c';
2824+
CREATE FUNCTION execq (text, integer) RETURNS integer
2825+
AS '...path_to_so'
2826+
LANGUAGE C;
28252827
</ProgramListing>
28262828

28272829
<ProgramListing>
2828-
vac=> SELECT execq('CREATE TABLE a (xINT4)', 0);
2830+
vac=> SELECT execq('CREATE TABLE a (xINTEGER)', 0);
28292831
execq
28302832
-----
28312833
0

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp