Compare commits
6 Commits
main
...
LireCarteV
Author | SHA1 | Date | |
---|---|---|---|
|
b61634fea9 | ||
|
6b6658f56d | ||
|
d56f7a2249 | ||
|
2b45f5aa7e | ||
|
a3fef1c38c | ||
|
a64876cfa0 |
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -1 +0,0 @@
|
||||
Cargo.lock -merge linguist-generated=false
|
@ -24,10 +24,6 @@ body:
|
||||
label: Ce problème est il relatif à un ou des modules en particulier ?
|
||||
multiple: true
|
||||
options:
|
||||
- Interface utilisateur⋅ice (crates/app)
|
||||
- Encapsulation Tauri (crates/desktop)
|
||||
- Moteur SESAM-Vitale (crates/sesam-vitale)
|
||||
- Librairie utilitaire (crates/utils)
|
||||
- Documentation (docs)
|
||||
- Scripts (scripts)
|
||||
- Autre
|
||||
- Clego
|
||||
- Tauri
|
||||
- Axum
|
||||
|
5
.gitignore
vendored
5
.gitignore
vendored
@ -21,8 +21,3 @@ target/
|
||||
*.sln
|
||||
*.sw?
|
||||
|
||||
# Ignore .env files
|
||||
.env
|
||||
|
||||
# Development Database
|
||||
*.sqlite
|
||||
|
3146
Cargo.lock
generated
3146
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
18
Cargo.toml
18
Cargo.toml
@ -1,21 +1,7 @@
|
||||
[workspace]
|
||||
resolver = "2"
|
||||
members = [
|
||||
"crates/backend",
|
||||
"crates/desktop",
|
||||
"crates/app",
|
||||
"crates/sesam-vitale",
|
||||
"crates/fsv",
|
||||
"crates/fsv-sys",
|
||||
"crates/utils",
|
||||
"migration",
|
||||
"entity",
|
||||
".",
|
||||
"crates/desktop"
|
||||
]
|
||||
|
||||
[workspace.dependencies]
|
||||
anyhow = "1.0"
|
||||
dotenv = "0.15"
|
||||
sea-orm-cli = "1.0.1"
|
||||
sea-orm = "1.0.1"
|
||||
serde = { version = "1.0.210", features = ["derive"] }
|
||||
thiserror = "1.0"
|
||||
|
113
README.md
113
README.md
@ -2,121 +2,68 @@
|
||||
|
||||
Logiciel de Pharmacie libre et open-source.
|
||||
|
||||
## Modules applicatifs
|
||||
## Crates
|
||||
|
||||
- `crates`: Dossier racine des modules Rust
|
||||
- `crates/backend`: Serveur backend propulsé par Axum, exposant une API REST
|
||||
- `crates/desktop`: Client desktop propulsé par Tauri, exposant le `frontend`
|
||||
- `crates/sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
|
||||
- `crates/utils`: Bibliothèque de fonctions utilitaires
|
||||
- `crates/fsv-sys`: Bindings Rust pour les librairies dynamiques FSV (SESAM-Vitale)
|
||||
- `frontend`: Interface web du logiciel, propulsée par Nuxt.js
|
||||
|
||||
## Installation
|
||||
|
||||
### Fichiers de configuration
|
||||
|
||||
Certaines librairies nécessitent de définir certaines paramètres de configuration pour fonctionner correctement, en particulier le moteur SESAM-Vitale.
|
||||
|
||||
Ces paramètres sont définis dans un fichier de configuration `.env` situé dans un des dossiers suivant (par ordre de priorité) :
|
||||
- dans le dossier courant (`./.env`)
|
||||
- dans le dossier du manifeste (par exemple `crates/sesam-vitale/.env`)
|
||||
- dans le dossier de configuration standard de l'OS (par exemple, sur linux, `~/.config/krys4lide/.env` - [plus d'info](https://github.com/dirs-dev/directories-rs?tab=readme-ov-file#projectdirs))
|
||||
|
||||
Des exemples de fichiers de configuration sont disponibles à la racine du projet : `.env.linux.example` et `.env.win.example`.
|
||||
- `app`: Interface du logiciel, servie par un serveur web propulsé par Axum. Utilisable en mode endpoint ou encapsulé dans le client `desktop`
|
||||
- `desktop`: Client desktop propulsé par Tauri, encapsulant le serveur web `app`
|
||||
- `sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
|
||||
|
||||
## Development
|
||||
|
||||
### Pré-requis
|
||||
|
||||
#### Frontend (Nuxt + Typescript)
|
||||
|
||||
Le frontend est propulsé par Nuxt.js, un framework TypeScript pour Vue.js. Pour le développement, il est nécessaire d'installer les dépendances suivantes :
|
||||
- [Bun](https://bun.sh/docs/installation), un gestionnaire de paquets, équivalent à `npm` en plus performant
|
||||
|
||||
#### Tauri CLI
|
||||
|
||||
TODO: Tauri CLI, réellement nécessaire ?
|
||||
|
||||
La CLI Tauri est nécessaire au lancement du client `desktop`. Elle peut être installée via Cargo :
|
||||
|
||||
```bash
|
||||
cargo install tauri-cli --version "^2.0.0-rc"
|
||||
cargo install tauri-cli --version "^2.0.0-beta"
|
||||
```
|
||||
|
||||
#### SeaORM CLI
|
||||
#### Tailwindcss CLI
|
||||
|
||||
SeaORM est notre ORM. Le CLI SeaORM est nécessaire pour la génération des modèles de la base de données et des migrations associées. Elle peut être installée via Cargo :
|
||||
Le CLI Tailwindcss est nécessaire pour la génération du fichier `crates/app/assets/css/style.css`.
|
||||
|
||||
```bash
|
||||
cargo install sea-orm-cli
|
||||
```
|
||||
La documentation d'installation est disponible sur le site officiel de Tailwindcss : https://tailwindcss.com/blog/standalone-cli
|
||||
|
||||
L'applicatif va chercher les informations de connexion à la base de données dans la variable `DATABASE_URL` importée depuis les [fichiers de configuration](#fichiers-de-configuration).
|
||||
La version actuellement utilisée est la [`v3.4.7`](https://github.com/tailwindlabs/tailwindcss/releases/tag/v3.4.7)
|
||||
|
||||
```.env
|
||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
||||
```
|
||||
#### SESAM-Vitale
|
||||
|
||||
Toutefois, l'usage de la CLI de SeaORM nécessite de renseigner les informations de connexion à la base de données dans un fichier `.env` situé à la racine du projet.
|
||||
|
||||
> Astuce : utilisé un lien symbolique pour éviter de dupliquer le fichier `.env`.
|
||||
|
||||
#### FSV-sys
|
||||
|
||||
La crate `fsv-sys` nécessite la présence des librairies fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `fsv-sys`.
|
||||
|
||||
#### Backend Hot-reload
|
||||
|
||||
Voir le [README](crates/backend/README.md) de la crate `backend` pour les prérequis de développement du serveur backend.
|
||||
La crate `sesam-vitale` nécessite la présence des librairies dynamiques fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `sesam-vitale`.
|
||||
|
||||
### Lancement
|
||||
|
||||
Pour lancer l'application en mode développement, il est nécessaire d'exécuter plusieurs composants simultanément :
|
||||
Le logiciel dans sa globalité peut être lancé via la commande suivante :
|
||||
|
||||
```bash
|
||||
# Lancement du serveur backend
|
||||
systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin backend'
|
||||
cargo tauri dev
|
||||
```
|
||||
|
||||
/!\ Attention, le lancement du client `desktop` ne génère pas le fichier `crates/app/assets/css/style.css` automatiquement pour le moment. En cas de modification des interfaces web, il est donc nécessaire de procéder à sa génération comme indiqué dans le [README](crates/app/README.md) de la crate `app`.
|
||||
|
||||
Si vous souhaitez lancer les composants séparément, les indications de lancement sont disponibles dans les README des différents crates.
|
||||
|
||||
- [app](crates/app/README.md)
|
||||
- [sesam-vitale](crates/sesam-vitale/README.md)
|
||||
|
||||
## Rechargement automatique
|
||||
|
||||
Pour permettre de développer plus rapidement, il existe une librairie qui recompile automatiquement nos modifications en cours : [`cargo-watch`](https://github.com/watchexec/cargo-watch) permet de relancer une commande `cargo` lorsqu'un fichier est modifié (example: `cargo run` --> `cargo watch -x run`).
|
||||
|
||||
Voici la commande pour l'installer dans un _package_ :
|
||||
```bash
|
||||
# Lancement de l'interface utilisateur (frontend ou desktop)
|
||||
# - frontend (serveur web, accessible via navigateur)
|
||||
bun run --cwd frontend/ dev
|
||||
# - desktop (client desktop, basé sur Tauri)
|
||||
cargo tauri dev --no-watch
|
||||
cargo add cargo-watch --dev --package app
|
||||
```
|
||||
|
||||
> Pour circonscrire les hot-reloads intempestifs mais peu utiles :
|
||||
> - le `backend` n'est rechargé que si des modifications sont détectées dans le dossier précisé par `-w crates/backend`
|
||||
> - le rechargement du `desktop` est désactivé par l'option `--no-watch` ; en effet, le rechargement du `frontend` est déjà pris en charge par `bun` et ne nécessite pas de rechargement du `desktop`
|
||||
Le fichier [`.ignore`](./ignore) permet d'ignorer certains fichiers pour éviter de relancer la recompilation inutilement.
|
||||
|
||||
⚠️ La librairie n'est pas compatible avec _Windows 7_ et les versions antérieurs de _Windows_.
|
||||
|
||||
## Build
|
||||
|
||||
Pour packager le client `desktop`, il est nécessaire de faire appel à la CLI Tauri, qui se charge de gérer le build du `frontend` et son intégration au bundle :
|
||||
Packager le client desktop
|
||||
|
||||
```bash
|
||||
cargo tauri build
|
||||
```
|
||||
|
||||
## Gestion de la base de données
|
||||
|
||||
### Création d'une migration
|
||||
|
||||
```bash
|
||||
sea-orm-cli migrate generate <nom_de_la_migration>
|
||||
```
|
||||
|
||||
Cette commande génère un fichier de migration à adapter dans le dossier `migration/src`.
|
||||
|
||||
### Appliquer les migrations
|
||||
|
||||
```bash
|
||||
sea-orm-cli migrate up
|
||||
```
|
||||
|
||||
### Génération des entitées
|
||||
|
||||
```bash
|
||||
sea-orm-cli generate entity -o entity/src/entities --with-serde both
|
||||
```
|
4
crates/app/.gitignore
vendored
Normal file
4
crates/app/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
/target
|
||||
|
||||
# Tailwind CSS CLI
|
||||
tailwindcss
|
19
crates/app/Cargo.toml
Normal file
19
crates/app/Cargo.toml
Normal file
@ -0,0 +1,19 @@
|
||||
[package]
|
||||
name = "app"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
askama = "0.12.1"
|
||||
askama_axum = "0.4.0"
|
||||
axum = "0.7.5"
|
||||
listenfd = "1.0.1"
|
||||
notify = "6.1.1"
|
||||
serde = { version = "1.0.204", features = ["derive"] }
|
||||
tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
|
||||
tower-http = { version = "0.5.2", features = ["fs"] }
|
||||
tower-livereload = "0.9.3"
|
||||
|
||||
[dev-dependencies]
|
||||
cargo-watch = "8.5.1"
|
||||
systemfd = "0.4.0"
|
35
crates/app/README.md
Normal file
35
crates/app/README.md
Normal file
@ -0,0 +1,35 @@
|
||||
## Pré-requis
|
||||
|
||||
- Récupérer le binaire TailwindCSS : https://tailwindcss.com/blog/standalone-cli
|
||||
|
||||
## Exécution
|
||||
|
||||
- Lancer tailwindcss en mode watch dans un terminal :
|
||||
```bash
|
||||
./tailwindcss -i css/input.css -o assets/css/style.css --watch
|
||||
```
|
||||
|
||||
- Lancer le serveur web dans un autre terminal :
|
||||
```bash
|
||||
cargo run --bin app
|
||||
```
|
||||
|
||||
## Rechargement automatique (_auto-reload_)
|
||||
|
||||
Pour le projet `app`, nous utilisons en plus de `cargo-watch` ses librairies :
|
||||
- [`systemfd`](https://github.com/mitsuhiko/systemfd) permet de redémarrer un serveur sans interrompre les connexions en cours, il transmet le descripteur de fichier du socket à une nouvelle instance du serveur (exemple: `cargo watch -x run` --> `systemfd --no-pid -s http::3000 -- cargo watch -x run`). Si le port est déjà pris il en prendra un autre.
|
||||
- [`listenfd`](https://github.com/mitsuhiko/listenfd) permet, côté _Rust_, de démarrer un serveur en utilisant des connexions déjà ouvertes.
|
||||
|
||||
Pour notre application voici la commande à lancer :
|
||||
|
||||
```bash
|
||||
systemfd --no-pid -s http::3000 -- cargo watch -x 'run --bin app'
|
||||
```
|
||||
|
||||
## Chargement à chaud (_livereload_)
|
||||
|
||||
Pour que notre navigateur rafraîchisse automatique notre page lorsque le serveur a été recompilé, nous utilisons la librairie [`tower-livereload`](https://github.com/leotaku/tower-livereload).
|
||||
|
||||
A chaque changement, que ça soit sur du code en _Rust_, _HTML_, _CSS_ ou _JS_ alors le navigateur va recharger entièrement la page.
|
||||
|
||||
En Rust, il n'existe pas encore d'outil de _Hot Reload_ complet et intégré comme on en trouve dans d'autres environnements de développement web, comme pour _Node.js_.
|
1
crates/app/assets/css/flowbite@2.5.1.min.css
vendored
Normal file
1
crates/app/assets/css/flowbite@2.5.1.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1132
crates/app/assets/css/style.css
Normal file
1132
crates/app/assets/css/style.css
Normal file
File diff suppressed because it is too large
Load Diff
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
Normal file
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
Normal file
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
Normal file
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
3
crates/app/css/input.css
Normal file
3
crates/app/css/input.css
Normal file
@ -0,0 +1,3 @@
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
29
crates/app/src/lib.rs
Normal file
29
crates/app/src/lib.rs
Normal file
@ -0,0 +1,29 @@
|
||||
mod pages;
|
||||
mod templates;
|
||||
|
||||
use std::path::Path;
|
||||
|
||||
use askama_axum::Template;
|
||||
use axum::http::{StatusCode, Uri};
|
||||
use tower_http::services::ServeDir;
|
||||
|
||||
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
||||
(StatusCode::NOT_FOUND, format!("No route for {uri}"))
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "index.html")]
|
||||
pub struct GetIndexTemplate;
|
||||
|
||||
async fn root() -> GetIndexTemplate {
|
||||
GetIndexTemplate {}
|
||||
}
|
||||
|
||||
pub fn get_router(assets_path: &Path) -> axum::Router {
|
||||
axum::Router::new()
|
||||
.nest_service("/assets", ServeDir::new(assets_path))
|
||||
.route("/", axum::routing::get(root))
|
||||
.nest("/pages", pages::get_routes())
|
||||
.merge(templates::get_routes())
|
||||
.fallback(fallback)
|
||||
}
|
63
crates/app/src/main.rs
Normal file
63
crates/app/src/main.rs
Normal file
@ -0,0 +1,63 @@
|
||||
use ::app::get_router;
|
||||
use axum::body::Body;
|
||||
use axum::http::Request;
|
||||
use listenfd::ListenFd;
|
||||
use notify::Watcher;
|
||||
use std::env;
|
||||
use std::path::Path;
|
||||
use tokio::net::TcpListener;
|
||||
use tower_livereload::predicate::Predicate;
|
||||
use tower_livereload::LiveReloadLayer;
|
||||
|
||||
/// Nous filtrons les requêtes de `htmx` pour ne pas inclure le script _JS_ qui gère le rechargement
|
||||
/// Voir https://github.com/leotaku/tower-livereload/pull/3
|
||||
#[derive(Copy, Clone)]
|
||||
struct NotHtmxPredicate;
|
||||
impl<T> Predicate<Request<T>> for NotHtmxPredicate {
|
||||
fn check(&mut self, req: &Request<T>) -> bool {
|
||||
!(req.headers().contains_key("hx-request"))
|
||||
}
|
||||
}
|
||||
|
||||
const DEFAULT_LISTENER: &str = "localhost:3000";
|
||||
async fn get_tcp_listener() -> TcpListener {
|
||||
let mut listenfd = ListenFd::from_env();
|
||||
|
||||
match listenfd.take_tcp_listener(0).unwrap() {
|
||||
// if we are given a tcp listener on listen fd 0, we use that one
|
||||
Some(listener) => {
|
||||
listener.set_nonblocking(true).unwrap();
|
||||
TcpListener::from_std(listener).unwrap()
|
||||
}
|
||||
// otherwise fall back to local listening
|
||||
None => TcpListener::bind(DEFAULT_LISTENER).await.unwrap(),
|
||||
}
|
||||
}
|
||||
|
||||
fn get_livereload_layer(templates_path: &Path) -> LiveReloadLayer<NotHtmxPredicate> {
|
||||
let livereload = LiveReloadLayer::new();
|
||||
let reloader = livereload.reloader();
|
||||
let mut watcher = notify::recommended_watcher(move |_| reloader.reload()).unwrap();
|
||||
watcher
|
||||
.watch(templates_path, notify::RecursiveMode::Recursive)
|
||||
.unwrap();
|
||||
livereload.request_predicate::<Body, NotHtmxPredicate>(NotHtmxPredicate)
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
||||
let assets_path = Path::new(&manifest_dir).join("assets");
|
||||
let templates_path = Path::new(&manifest_dir).join("templates");
|
||||
|
||||
let livereload_layer = get_livereload_layer(&templates_path);
|
||||
let router = get_router(assets_path.as_path()).layer(livereload_layer);
|
||||
|
||||
let listener: TcpListener = get_tcp_listener().await;
|
||||
println!("Listening on: http://{}", listener.local_addr().unwrap());
|
||||
|
||||
// Run the server with the router
|
||||
axum::serve(listener, router.into_make_service())
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
9
crates/app/src/pages/cps.rs
Normal file
9
crates/app/src/pages/cps.rs
Normal file
@ -0,0 +1,9 @@
|
||||
use askama_axum::Template;
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "pages/cps.html")]
|
||||
pub struct CpsTemplate;
|
||||
|
||||
pub async fn cps() -> CpsTemplate {
|
||||
CpsTemplate
|
||||
}
|
9
crates/app/src/pages/home.rs
Normal file
9
crates/app/src/pages/home.rs
Normal file
@ -0,0 +1,9 @@
|
||||
use askama_axum::Template;
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "pages/home.html")]
|
||||
pub struct HomeTemplate;
|
||||
|
||||
pub async fn home() -> HomeTemplate {
|
||||
HomeTemplate
|
||||
}
|
10
crates/app/src/pages/mod.rs
Normal file
10
crates/app/src/pages/mod.rs
Normal file
@ -0,0 +1,10 @@
|
||||
use axum::{routing, Router};
|
||||
|
||||
mod cps;
|
||||
mod home;
|
||||
|
||||
pub fn get_routes() -> Router {
|
||||
Router::new()
|
||||
.route("/home", routing::get(home::home))
|
||||
.route("/cps", routing::get(cps::cps))
|
||||
}
|
18
crates/app/src/templates/hello.rs
Normal file
18
crates/app/src/templates/hello.rs
Normal file
@ -0,0 +1,18 @@
|
||||
use askama_axum::Template;
|
||||
use axum::{routing, Router};
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "hello.html")]
|
||||
struct HelloTemplate {
|
||||
pub name: String,
|
||||
}
|
||||
|
||||
async fn hello() -> HelloTemplate {
|
||||
HelloTemplate {
|
||||
name: "Theo".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_routes() -> Router {
|
||||
Router::new().route("/", routing::get(hello))
|
||||
}
|
12
crates/app/src/templates/mod.rs
Normal file
12
crates/app/src/templates/mod.rs
Normal file
@ -0,0 +1,12 @@
|
||||
use axum::Router;
|
||||
|
||||
mod hello;
|
||||
mod nav;
|
||||
mod profile;
|
||||
|
||||
pub fn get_routes() -> Router {
|
||||
Router::new()
|
||||
.nest("/hello", hello::get_routes())
|
||||
.nest("/nav", nav::get_routes())
|
||||
.nest("/profile", profile::get_routes())
|
||||
}
|
60
crates/app/src/templates/nav.rs
Normal file
60
crates/app/src/templates/nav.rs
Normal file
@ -0,0 +1,60 @@
|
||||
use askama_axum::Template;
|
||||
use axum::{extract::Query, routing, Router};
|
||||
use serde::Deserialize;
|
||||
|
||||
struct MenuItem {
|
||||
label: String,
|
||||
href: String,
|
||||
current: bool,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct MenuParameters {
|
||||
mobile: bool,
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "layout/nav/nav-menu-items.html")]
|
||||
struct MenuTemplate {
|
||||
mobile: bool,
|
||||
items: Vec<MenuItem>,
|
||||
}
|
||||
|
||||
impl MenuTemplate {
|
||||
fn get_classes(&self, is_current_item: &bool) -> String {
|
||||
let common_classes = match self.mobile {
|
||||
true => "block border-l-4 py-2 pl-3 pr-4 text-base font-medium".to_string(),
|
||||
false => {
|
||||
"inline-flex items-center border-b-2 px-1 pt-1 text-sm font-medium".to_string()
|
||||
}
|
||||
};
|
||||
match (self.mobile, is_current_item) {
|
||||
(true, true) => common_classes + " border-indigo-500 bg-indigo-50 text-indigo-700",
|
||||
(true, false) => common_classes + " border-transparent text-gray-600 hover:border-gray-300 hover:bg-gray-50 hover:text-gray-800",
|
||||
(false, true) => common_classes + " border-indigo-500 text-gray-900",
|
||||
(false, false) => common_classes + " border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn menu(Query(params): Query<MenuParameters>) -> MenuTemplate {
|
||||
MenuTemplate {
|
||||
mobile: params.mobile,
|
||||
items: vec![
|
||||
MenuItem {
|
||||
label: "Accueil".to_string(),
|
||||
href: "/pages/home".to_string(),
|
||||
current: true,
|
||||
},
|
||||
MenuItem {
|
||||
label: "CPS".to_string(),
|
||||
href: "/pages/cps".to_string(),
|
||||
current: false,
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_routes() -> Router {
|
||||
Router::new().route("/menu", routing::get(menu))
|
||||
}
|
63
crates/app/src/templates/profile.rs
Normal file
63
crates/app/src/templates/profile.rs
Normal file
@ -0,0 +1,63 @@
|
||||
use askama_axum::Template;
|
||||
use axum::{extract::Query, routing, Router};
|
||||
use serde::Deserialize;
|
||||
|
||||
struct MenuItem {
|
||||
label: String,
|
||||
id: String,
|
||||
current: bool,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct MenuParameters {
|
||||
mobile: bool,
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "layout/nav/profile-menu-items.html")]
|
||||
struct MenuTemplate {
|
||||
mobile: bool,
|
||||
items: Vec<MenuItem>,
|
||||
}
|
||||
|
||||
impl MenuTemplate {
|
||||
fn get_classes(&self, is_current_item: &bool) -> String {
|
||||
let common_classes = match self.mobile {
|
||||
true => "block px-4 py-2 text-base font-medium text-gray-500 hover:bg-gray-100 hover:text-gray-800".to_string(),
|
||||
false => "block px-4 py-2 text-sm text-gray-700".to_string(),
|
||||
};
|
||||
match (self.mobile, is_current_item) {
|
||||
(true, true) => common_classes + "", // ???
|
||||
(true, false) => common_classes + "",
|
||||
(false, true) => common_classes + " bg-gray-100",
|
||||
(false, false) => common_classes + "",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn menu(Query(params): Query<MenuParameters>) -> MenuTemplate {
|
||||
MenuTemplate {
|
||||
mobile: params.mobile,
|
||||
items: vec![
|
||||
MenuItem {
|
||||
label: "Votre profil".to_string(),
|
||||
id: "profile".to_string(),
|
||||
current: false,
|
||||
},
|
||||
MenuItem {
|
||||
label: "Paramètres".to_string(),
|
||||
id: "settings".to_string(),
|
||||
current: false,
|
||||
},
|
||||
MenuItem {
|
||||
label: "Déconnexion".to_string(),
|
||||
id: "logout".to_string(),
|
||||
current: false,
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_routes() -> Router {
|
||||
Router::new().route("/menu", routing::get(menu))
|
||||
}
|
12
crates/app/tailwind.config.js
Normal file
12
crates/app/tailwind.config.js
Normal file
@ -0,0 +1,12 @@
|
||||
/** @type {import('tailwindcss').Config} */
|
||||
module.exports = {
|
||||
content: [
|
||||
'./templates/**/*.html',
|
||||
'./css/**/*.css',
|
||||
],
|
||||
theme: {
|
||||
extend: {},
|
||||
},
|
||||
plugins: [],
|
||||
}
|
||||
|
23
crates/app/templates/base.html
Normal file
23
crates/app/templates/base.html
Normal file
@ -0,0 +1,23 @@
|
||||
<!doctype html>
|
||||
<html lang="fr" class="h-full">
|
||||
<head>
|
||||
<title>{% block title %}{{ title }}{% endblock %}</title>
|
||||
|
||||
<script src="/assets/js/htmx@2.0.1.min.js"></script>
|
||||
<script src="/assets/js/alpinejs@3.14.1.min.js" defer></script>
|
||||
<link href="/assets/css/style.css" rel="stylesheet">
|
||||
<link href="/assets/css/flowbite@2.5.1.min.css" rel="stylesheet" />
|
||||
<script src="/assets/js/flowbite@2.5.1.min.js"></script>
|
||||
|
||||
{% block head %}{% endblock %}
|
||||
</head>
|
||||
<body class="h-full">
|
||||
<div class="min-h-full">
|
||||
{% block nav %}
|
||||
{% include "layout/nav.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}{% endblock %}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
1
crates/app/templates/hello.html
Normal file
1
crates/app/templates/hello.html
Normal file
@ -0,0 +1 @@
|
||||
<div>Hello {{name}}!</div>
|
34
crates/app/templates/index.html
Normal file
34
crates/app/templates/index.html
Normal file
@ -0,0 +1,34 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Pharma Libre{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="py-10">
|
||||
<header>
|
||||
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
|
||||
<h1
|
||||
id="page-title"
|
||||
class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
|
||||
>
|
||||
{% include "skeletons/page-title.html" %}
|
||||
</h1>
|
||||
</div>
|
||||
</header>
|
||||
<main>
|
||||
<div
|
||||
id="main-container"
|
||||
class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
|
||||
>
|
||||
<!-- Your content -->
|
||||
<div
|
||||
hx-get="/pages/home"
|
||||
hx-target="this"
|
||||
hx-trigger="load"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
{% include "skeletons/card.html" %}
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
{% endblock %}
|
41
crates/app/templates/layout/nav.html
Normal file
41
crates/app/templates/layout/nav.html
Normal file
@ -0,0 +1,41 @@
|
||||
<nav
|
||||
class="border-b border-gray-200 bg-white"
|
||||
x-data="{ menuOpen: false }"
|
||||
>
|
||||
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
|
||||
<div class="flex h-16 justify-between">
|
||||
<div class="flex">
|
||||
{% include "layout/nav/logo.html" %}
|
||||
<div class="hidden sm:-my-px sm:ml-6 sm:flex sm:space-x-8">
|
||||
{% include "layout/nav/desktop/menu-items.html" %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="hidden sm:ml-6 sm:flex sm:items-center">
|
||||
{% include "layout/nav/desktop/notifications-button.html" %}
|
||||
{% include "layout/nav/desktop/profile.html" %}
|
||||
</div>
|
||||
<div class="-mr-2 flex items-center sm:hidden">
|
||||
{% include "layout/nav/mobile/menu-button.html" %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Mobile menu, show/hide based on menu state. -->
|
||||
<div
|
||||
class="sm:hidden" id="mobile-menu"
|
||||
x-show="menuOpen"
|
||||
x-cloak
|
||||
>
|
||||
<div class="space-y-1 pb-3 pt-2">
|
||||
{% include "layout/nav/mobile/menu-items.html" %}
|
||||
</div>
|
||||
<div class="border-t border-gray-200 pb-3 pt-4">
|
||||
<div class="flex items-center px-4">
|
||||
{% include "layout/nav/mobile/profile.html" %}
|
||||
{% include "layout/nav/mobile/notifications-button.html" %}
|
||||
</div>
|
||||
<div class="mt-3 space-y-1">
|
||||
{% include "layout/nav/mobile/profile-items.html" %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
9
crates/app/templates/layout/nav/desktop/menu-items.html
Normal file
9
crates/app/templates/layout/nav/desktop/menu-items.html
Normal file
@ -0,0 +1,9 @@
|
||||
<div
|
||||
id="nav-menu-desktop"
|
||||
hx-get="/nav/menu?mobile=false"
|
||||
hx-target="this"
|
||||
hx-trigger="load"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
{% include "skeletons/menu-items.html" %}
|
||||
</div>
|
@ -0,0 +1,6 @@
|
||||
<button
|
||||
type="button"
|
||||
class="relative rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
|
||||
>
|
||||
{% include "layout/nav/notifications-icon.html" %}
|
||||
</button>
|
@ -0,0 +1,22 @@
|
||||
<div
|
||||
class="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
|
||||
role="menu"
|
||||
id="profile-dropdown"
|
||||
aria-orientation="vertical"
|
||||
aria-labelledby="user-menu-button"
|
||||
tabindex="-1"
|
||||
x-show="profileOpen"
|
||||
x-on:click.outside="profileOpen = false"
|
||||
x-cloak
|
||||
x-transition
|
||||
>
|
||||
<div
|
||||
id="profile-menu-desktop"
|
||||
hx-get="/profile/menu?mobile=false"
|
||||
hx-target="this"
|
||||
hx-trigger="load"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
Chargement ...
|
||||
</div>
|
||||
</div>
|
27
crates/app/templates/layout/nav/desktop/profile.html
Normal file
27
crates/app/templates/layout/nav/desktop/profile.html
Normal file
@ -0,0 +1,27 @@
|
||||
<!-- Profile dropdown -->
|
||||
<div
|
||||
class="relative ml-3"
|
||||
x-data="{ profileOpen: false }"
|
||||
>
|
||||
<div>
|
||||
<button
|
||||
type="button"
|
||||
class="relative flex max-w-xs items-center rounded-full bg-white text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
|
||||
id="user-menu-button"
|
||||
aria-controls="profile-dropdown"
|
||||
aria-expanded="false"
|
||||
aria-haspopup="menu"
|
||||
x-on:click="profileOpen = ! profileOpen"
|
||||
>
|
||||
<span class="absolute -inset-1.5"></span>
|
||||
<span class="sr-only">Open user menu</span>
|
||||
<img
|
||||
class="h-8 w-8 rounded-full"
|
||||
src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
|
||||
alt=""
|
||||
/>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{% include "layout/nav/desktop/profile-dropdown.html" %}
|
||||
</div>
|
4
crates/app/templates/layout/nav/logo.html
Normal file
4
crates/app/templates/layout/nav/logo.html
Normal file
@ -0,0 +1,4 @@
|
||||
<div class="flex flex-shrink-0 items-center">
|
||||
<img class="block h-8 w-auto lg:hidden" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
|
||||
<img class="hidden h-8 w-auto lg:block" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
|
||||
</div>
|
43
crates/app/templates/layout/nav/mobile/menu-button.html
Normal file
43
crates/app/templates/layout/nav/mobile/menu-button.html
Normal file
@ -0,0 +1,43 @@
|
||||
<!-- Mobile menu button -->
|
||||
<button
|
||||
type="button"
|
||||
class="relative inline-flex items-center justify-center rounded-md bg-white p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
|
||||
aria-controls="mobile-menu"
|
||||
x-on:click="menuOpen = ! menuOpen"
|
||||
x-bind:aria-expanded="menuOpen"
|
||||
>
|
||||
<span class="absolute -inset-0.5"></span>
|
||||
<span class="sr-only">Open main menu</span>
|
||||
<!-- Menu open: "hidden", Menu closed: "block" -->
|
||||
<svg
|
||||
class="h-6 w-6"
|
||||
fill="none"
|
||||
viewBox="0 0 24 24"
|
||||
stroke-width="1.5"
|
||||
stroke="currentColor"
|
||||
x-bind:class="menuOpen ? 'hidden' : 'block'"
|
||||
x-bind:aria-hidden="menuOpen"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"
|
||||
/>
|
||||
</svg>
|
||||
<!-- Menu open: "block", Menu closed: "hidden" -->
|
||||
<svg
|
||||
class="h-6 w-6"
|
||||
fill="none"
|
||||
viewBox="0 0 24 24"
|
||||
stroke-width="1.5"
|
||||
stroke="currentColor"
|
||||
x-bind:class="menuOpen ? 'block' : 'hidden'"
|
||||
x-bind:aria-hidden="! menuOpen"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
d="M6 18L18 6M6 6l12 12"
|
||||
/>
|
||||
</svg>
|
||||
</button>
|
9
crates/app/templates/layout/nav/mobile/menu-items.html
Normal file
9
crates/app/templates/layout/nav/mobile/menu-items.html
Normal file
@ -0,0 +1,9 @@
|
||||
<div
|
||||
id="nav-menu-mobile"
|
||||
hx-get="/nav/menu?mobile=true"
|
||||
hx-target="this"
|
||||
hx-trigger="load"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
Chargement ...
|
||||
</div>
|
@ -0,0 +1,6 @@
|
||||
<button
|
||||
type="button"
|
||||
class="relative ml-auto flex-shrink-0 rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
|
||||
>
|
||||
{% include "layout/nav/notifications-icon.html" %}
|
||||
</button>
|
@ -0,0 +1,9 @@
|
||||
<div
|
||||
id="profile-menu-mobile"
|
||||
hx-get="/profile/menu?mobile=true"
|
||||
hx-target="this"
|
||||
hx-trigger="load"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
Chargement ...
|
||||
</div>
|
11
crates/app/templates/layout/nav/mobile/profile.html
Normal file
11
crates/app/templates/layout/nav/mobile/profile.html
Normal file
@ -0,0 +1,11 @@
|
||||
<div class="flex-shrink-0">
|
||||
<img
|
||||
class="h-10 w-10 rounded-full"
|
||||
src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
<div class="ml-3">
|
||||
<div class="text-base font-medium text-gray-800">Tom Cook</div>
|
||||
<div class="text-sm font-medium text-gray-500">tom@example.com</div>
|
||||
</div>
|
13
crates/app/templates/layout/nav/nav-menu-items.html
Normal file
13
crates/app/templates/layout/nav/nav-menu-items.html
Normal file
@ -0,0 +1,13 @@
|
||||
{% for item in items %}
|
||||
<a
|
||||
href=""
|
||||
hx-get="{{ item.href }}"
|
||||
hx-trigger="click"
|
||||
hx-target="#main-container"
|
||||
hx-swap="innerHTML"
|
||||
class="{{ Self::get_classes(self, item.current) }}"
|
||||
aria-current="{% if item.current %}page{% endif %}"
|
||||
>
|
||||
{{ item.label }}
|
||||
</a>
|
||||
{% endfor %}
|
16
crates/app/templates/layout/nav/notifications-icon.html
Normal file
16
crates/app/templates/layout/nav/notifications-icon.html
Normal file
@ -0,0 +1,16 @@
|
||||
<span class="absolute -inset-1.5"></span>
|
||||
<span class="sr-only">View notifications</span>
|
||||
<svg
|
||||
class="h-6 w-6"
|
||||
fill="none"
|
||||
viewBox="0 0 24 24"
|
||||
stroke-width="1.5"
|
||||
stroke="currentColor"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0"
|
||||
/>
|
||||
</svg>
|
11
crates/app/templates/layout/nav/profile-menu-items.html
Normal file
11
crates/app/templates/layout/nav/profile-menu-items.html
Normal file
@ -0,0 +1,11 @@
|
||||
{% for item in items %}
|
||||
<a
|
||||
href="#{{ item.id }}"
|
||||
class="{{ Self::get_classes(self, item.current) }}"
|
||||
role="menuitem"
|
||||
tabindex="-1"
|
||||
id="{{ item.id }}"
|
||||
>
|
||||
{{ item.label }}
|
||||
</a>
|
||||
{% endfor %}
|
52
crates/app/templates/pages/cps.html
Normal file
52
crates/app/templates/pages/cps.html
Normal file
@ -0,0 +1,52 @@
|
||||
<h3 id="page-title" hx-swap-oob="textContent">
|
||||
CPS
|
||||
</h3>
|
||||
|
||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
||||
<div
|
||||
class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||
></div>
|
||||
</div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
||||
></div>
|
||||
<div class="grid grid-cols-2 gap-4 mb-4">
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
</div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
||||
></div>
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
</div>
|
52
crates/app/templates/pages/home.html
Normal file
52
crates/app/templates/pages/home.html
Normal file
@ -0,0 +1,52 @@
|
||||
<h3 id="page-title" hx-swap-oob="textContent">
|
||||
Accueil
|
||||
</h3>
|
||||
|
||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
||||
<div
|
||||
class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||
></div>
|
||||
</div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
||||
></div>
|
||||
<div class="grid grid-cols-2 gap-4 mb-4">
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
</div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
||||
></div>
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
<div
|
||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
||||
></div>
|
||||
</div>
|
22
crates/app/templates/skeletons/card.html
Normal file
22
crates/app/templates/skeletons/card.html
Normal file
@ -0,0 +1,22 @@
|
||||
<div role="status" class="animate-pulse max-w-sm p-4 border border-gray-200 rounded shadow md:p-6 dark:border-gray-700">
|
||||
<div class="flex items-center justify-center h-48 mb-4 bg-gray-300 rounded dark:bg-gray-700">
|
||||
<svg class="w-10 h-10 text-gray-200 dark:text-gray-600" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 20">
|
||||
<path d="M14.066 0H7v5a2 2 0 0 1-2 2H0v11a1.97 1.97 0 0 0 1.934 2h12.132A1.97 1.97 0 0 0 16 18V2a1.97 1.97 0 0 0-1.934-2ZM10.5 6a1.5 1.5 0 1 1 0 2.999A1.5 1.5 0 0 1 10.5 6Zm2.221 10.515a1 1 0 0 1-.858.485h-8a1 1 0 0 1-.9-1.43L5.6 10.039a.978.978 0 0 1 .936-.57 1 1 0 0 1 .9.632l1.181 2.981.541-1a.945.945 0 0 1 .883-.522 1 1 0 0 1 .879.529l1.832 3.438a1 1 0 0 1-.031.988Z"/>
|
||||
<path d="M5 5V.13a2.96 2.96 0 0 0-1.293.749L.879 3.707A2.98 2.98 0 0 0 .13 5H5Z"/>
|
||||
</svg>
|
||||
</div>
|
||||
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
|
||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||
<div class="flex items-center mt-4">
|
||||
<svg class="w-10 h-10 me-3 text-gray-200 dark:text-gray-700" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
|
||||
<path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/>
|
||||
</svg>
|
||||
<div>
|
||||
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-32 mb-2"></div>
|
||||
<div class="w-48 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||
</div>
|
||||
</div>
|
||||
<span class="sr-only">Loading...</span>
|
||||
</div>
|
4
crates/app/templates/skeletons/menu-items.html
Normal file
4
crates/app/templates/skeletons/menu-items.html
Normal file
@ -0,0 +1,4 @@
|
||||
<div role="status" class="animate-pulse flex items-center justify-center h-full">
|
||||
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700 me-3"></div>
|
||||
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||
</div>
|
1
crates/app/templates/skeletons/page-title.html
Normal file
1
crates/app/templates/skeletons/page-title.html
Normal file
@ -0,0 +1 @@
|
||||
<div role="status" class="animate-pulse h-7 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mt-3"></div>
|
@ -1,29 +0,0 @@
|
||||
[package]
|
||||
name = "backend"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.89"
|
||||
axum = { version = "0.7.6", features = ["macros"] }
|
||||
listenfd = "1.0.1"
|
||||
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
|
||||
tower-http = { version = "0.6.1", features = ["cors"] }
|
||||
|
||||
sea-orm = { workspace = true, features = [
|
||||
# Same `ASYNC_RUNTIME` and `DATABASE_DRIVER` as in the migration crate
|
||||
"sqlx-sqlite",
|
||||
"runtime-tokio-rustls",
|
||||
"macros",
|
||||
] }
|
||||
serde.workspace = true
|
||||
thiserror.workspace = true
|
||||
|
||||
entity = { path = "../../entity" }
|
||||
migration = { path = "../../migration" }
|
||||
utils = { path = "../utils" }
|
||||
|
||||
[dev-dependencies]
|
||||
cargo-watch = "8.5.2"
|
||||
sea-orm-cli.workspace = true
|
||||
systemfd = "0.4.3"
|
@ -1,28 +0,0 @@
|
||||
# Backend
|
||||
|
||||
Ceci est un serveur backend, basé sur axum, et permettant d'offrir une gestion centralisée des accès aux données.
|
||||
|
||||
## Prérequis
|
||||
|
||||
En développement, le mécanisme de hot-reload nécessite de disposer de `cargo-watch` et `systemfd`. Pour les installer, exécutez la commande suivante :
|
||||
|
||||
```bash
|
||||
cargo install cargo-watch systemfd
|
||||
```
|
||||
|
||||
## Configuration
|
||||
|
||||
> Astuce : lorsqu'on exécute directement la crate `backend` à des fins de développement, le système de configuration n'utilisera pas l'éventuel fichier `.env` situé à la racine du workspace Rust. Pour éviter de dupliquer le fichier `.env`, il est possible de créer un lien symbolique vers le fichier `.env` de la crate `backend` :
|
||||
|
||||
```bash
|
||||
cd crates/backend
|
||||
ln -s ../../.env .env
|
||||
```
|
||||
|
||||
## Développement
|
||||
|
||||
Pour lancer le serveur en mode développement, exécutez la commande suivante :
|
||||
|
||||
```bash
|
||||
systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin backend'
|
||||
```
|
@ -1,48 +0,0 @@
|
||||
use axum::{extract::State, routing, Json};
|
||||
use sea_orm::*;
|
||||
use serde::Serialize;
|
||||
|
||||
use ::entity::{debug, debug::Entity as DebugEntity};
|
||||
|
||||
use crate::{AppError, AppState};
|
||||
|
||||
// DATABASE DEBUG CONTROLLERS
|
||||
|
||||
async fn get_debug_entries(db: &DatabaseConnection) -> Result<Vec<debug::Model>, DbErr> {
|
||||
DebugEntity::find().all(db).await
|
||||
}
|
||||
|
||||
async fn add_random_debug_entry(State(AppState { db_connection }): State<AppState>) {
|
||||
let random_entry = debug::ActiveModel {
|
||||
title: Set("Random title".to_string()),
|
||||
text: Set("Random text".to_string()),
|
||||
..Default::default()
|
||||
};
|
||||
random_entry.insert(&db_connection).await.unwrap();
|
||||
}
|
||||
|
||||
// API HANDLER
|
||||
|
||||
#[derive(Serialize, Debug)]
|
||||
struct DebugResponse {
|
||||
db_ping_status: bool,
|
||||
entries: Vec<debug::Model>,
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
async fn debug(
|
||||
State(AppState { db_connection }): State<AppState>,
|
||||
) -> Result<Json<DebugResponse>, AppError> {
|
||||
let db_ping_status = db_connection.ping().await.is_ok();
|
||||
let debug_entries = get_debug_entries(&db_connection).await?;
|
||||
Ok(Json(DebugResponse {
|
||||
db_ping_status,
|
||||
entries: debug_entries,
|
||||
}))
|
||||
}
|
||||
|
||||
pub fn get_routes() -> axum::Router<crate::AppState> {
|
||||
axum::Router::new()
|
||||
.route("/", routing::get(debug))
|
||||
.route("/add_random", routing::post(add_random_debug_entry))
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
use axum::Router;
|
||||
|
||||
use crate::AppState;
|
||||
|
||||
mod debug;
|
||||
|
||||
pub fn get_routes() -> Router<AppState> {
|
||||
Router::new().nest("/debug", debug::get_routes())
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
use migration::{Migrator, MigratorTrait};
|
||||
use sea_orm::{Database, DatabaseConnection, DbErr};
|
||||
use std::env;
|
||||
|
||||
pub async fn get_connection() -> Result<DatabaseConnection, DbErr> {
|
||||
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
||||
|
||||
let db_connection = Database::connect(database_url).await?;
|
||||
Migrator::up(&db_connection, None).await?;
|
||||
Ok(db_connection)
|
||||
}
|
@ -1,72 +0,0 @@
|
||||
use anyhow::Error as AnyError;
|
||||
use axum::http::{header, StatusCode, Uri};
|
||||
use axum::response::{IntoResponse, Response};
|
||||
use axum::{routing::get, Router};
|
||||
use sea_orm::{DatabaseConnection, DbErr};
|
||||
use thiserror::Error;
|
||||
use tower_http::cors::{Any, CorsLayer};
|
||||
|
||||
use ::utils::config::{load_config, ConfigError};
|
||||
|
||||
mod api;
|
||||
mod db;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum InitError {
|
||||
#[error(transparent)]
|
||||
ConfigError(#[from] ConfigError),
|
||||
}
|
||||
|
||||
pub fn init() -> Result<(), InitError> {
|
||||
load_config(None)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct AppState {
|
||||
db_connection: DatabaseConnection,
|
||||
}
|
||||
|
||||
pub async fn get_router() -> Result<Router, DbErr> {
|
||||
let db_connection = db::get_connection().await?;
|
||||
let state: AppState = AppState { db_connection };
|
||||
|
||||
let cors = CorsLayer::new()
|
||||
.allow_methods(Any)
|
||||
.allow_origin(Any)
|
||||
.allow_headers([header::CONTENT_TYPE]);
|
||||
|
||||
Ok(Router::new()
|
||||
.route("/", get(|| async { "Hello, world!" }))
|
||||
.merge(api::get_routes())
|
||||
.fallback(fallback)
|
||||
.with_state(state)
|
||||
.layer(cors))
|
||||
}
|
||||
|
||||
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
||||
(StatusCode::NOT_FOUND, format!("No route for {uri}"))
|
||||
}
|
||||
|
||||
struct AppError(AnyError);
|
||||
|
||||
// To automatically convert `AppError` into a response
|
||||
impl IntoResponse for AppError {
|
||||
fn into_response(self) -> Response {
|
||||
(
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
format!("Internal Server Error: {}", self.0),
|
||||
)
|
||||
.into_response()
|
||||
}
|
||||
}
|
||||
|
||||
// To automatically convert `AnyError` into `AppError`
|
||||
impl<E> From<E> for AppError
|
||||
where
|
||||
E: Into<AnyError>,
|
||||
{
|
||||
fn from(err: E) -> Self {
|
||||
Self(err.into())
|
||||
}
|
||||
}
|
@ -1,39 +0,0 @@
|
||||
use listenfd::ListenFd;
|
||||
use thiserror::Error;
|
||||
use tokio::net::TcpListener;
|
||||
|
||||
use backend::{get_router, init, InitError};
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum BackendError {
|
||||
#[error("Error while setting up or serving the TCP listener")]
|
||||
ServeTCPListener(#[from] std::io::Error),
|
||||
#[error("Error while initialising the backend")]
|
||||
InitError(#[from] InitError),
|
||||
#[error("Error with the database connection")]
|
||||
DatabaseConnection(#[from] sea_orm::DbErr),
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), BackendError> {
|
||||
init()?;
|
||||
|
||||
let app = get_router().await?;
|
||||
|
||||
let mut listenfd = ListenFd::from_env();
|
||||
let listener = match listenfd.take_tcp_listener(0)? {
|
||||
// if we are given a tcp listener on listen fd 0, we use that one
|
||||
Some(listener) => {
|
||||
listener.set_nonblocking(true)?;
|
||||
TcpListener::from_std(listener)?
|
||||
}
|
||||
// otherwise fall back to local listening
|
||||
None => TcpListener::bind("0.0.0.0:8080").await?,
|
||||
};
|
||||
|
||||
let local_addr = listener.local_addr()?;
|
||||
println!("Listening on http://{}", local_addr);
|
||||
axum::serve(listener, app).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
@ -10,15 +10,15 @@ name = "desktop_lib"
|
||||
crate-type = ["lib", "cdylib", "staticlib"]
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "2.0.0-rc", features = [] }
|
||||
tauri-build = { version = "2.0.0-beta", features = [] }
|
||||
|
||||
[dependencies]
|
||||
bytes = "1.6.1"
|
||||
http = "1.1.0"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
tauri = { version = "2.0.0-rc", features = [] }
|
||||
tauri-plugin-shell = "2.0.0-rc"
|
||||
axum = "0.7.5"
|
||||
tauri = { version = "2.0.0-beta", features = [] }
|
||||
tower = "0.4.13"
|
||||
tokio = "1.39.1"
|
||||
|
||||
app = { path = "../app" }
|
||||
http = "1.1.0"
|
||||
bytes = "1.6.1"
|
||||
|
||||
thiserror.workspace = true
|
||||
|
@ -1,10 +0,0 @@
|
||||
{
|
||||
"$schema": "../gen/schemas/desktop-schema.json",
|
||||
"identifier": "default",
|
||||
"description": "Capability for the main window",
|
||||
"windows": ["main"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"shell:allow-open"
|
||||
]
|
||||
}
|
@ -1,14 +1,69 @@
|
||||
// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
|
||||
#[tauri::command]
|
||||
fn greet(name: &str) -> String {
|
||||
format!("Hello, {}! You've been greeted from Rust!", name)
|
||||
use bytes::Bytes;
|
||||
use http::{request, response, Request, Response};
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::body::{to_bytes, Body};
|
||||
|
||||
use axum::Router;
|
||||
|
||||
use tauri::path::BaseDirectory;
|
||||
use tauri::Manager;
|
||||
use tokio::sync::{Mutex, MutexGuard};
|
||||
use tower::{Service, ServiceExt};
|
||||
|
||||
async fn process_tauri_request(
|
||||
tauri_request: Request<Vec<u8>>,
|
||||
mut router: MutexGuard<'_, Router>,
|
||||
) -> Response<Vec<u8>> {
|
||||
let (parts, body): (request::Parts, Vec<u8>) = tauri_request.into_parts();
|
||||
let axum_request: Request<Body> = Request::from_parts(parts, body.into());
|
||||
|
||||
let axum_response: Response<Body> = router
|
||||
.as_service()
|
||||
.ready()
|
||||
.await
|
||||
.expect("Failed to get ready service from router")
|
||||
.call(axum_request)
|
||||
.await
|
||||
.expect("Could not get response from router");
|
||||
|
||||
let (parts, body): (response::Parts, Body) = axum_response.into_parts();
|
||||
let body: Bytes = to_bytes(body, usize::MAX).await.unwrap_or_default();
|
||||
|
||||
let tauri_response: Response<Vec<u8>> = Response::from_parts(parts, body.into());
|
||||
|
||||
tauri_response
|
||||
}
|
||||
|
||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||
pub fn run() {
|
||||
tauri::Builder::default()
|
||||
.plugin(tauri_plugin_shell::init())
|
||||
.invoke_handler(tauri::generate_handler![greet])
|
||||
.setup(|app| {
|
||||
let assets_path: PathBuf = app
|
||||
.path()
|
||||
.resolve("assets", BaseDirectory::Resource)
|
||||
.expect("Path should be resolvable");
|
||||
|
||||
// Adds Axum router to application state
|
||||
// This makes it so we can retrieve it from any app instance (see bellow)
|
||||
let router = Arc::new(Mutex::new(app::get_router(&assets_path)));
|
||||
|
||||
app.manage(router);
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.register_asynchronous_uri_scheme_protocol("axum", move |app, request, responder| {
|
||||
// Retrieve the router from the application state and clone it for the async block
|
||||
let router = Arc::clone(&app.state::<Arc<Mutex<axum::Router>>>());
|
||||
|
||||
// Spawn a new async task to process the request
|
||||
tauri::async_runtime::spawn(async move {
|
||||
let router = router.lock().await;
|
||||
let response = process_tauri_request(request, router).await;
|
||||
responder.respond(response);
|
||||
});
|
||||
})
|
||||
.run(tauri::generate_context!())
|
||||
.expect("error while running tauri application");
|
||||
}
|
||||
|
@ -1,24 +1,20 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2.0.0-rc",
|
||||
"productName": "Chrys4lide LGO",
|
||||
"productName": "Logiciel Pharma",
|
||||
"version": "0.0.1",
|
||||
"identifier": "org.p4pillon.chrys4lide.lgo",
|
||||
"identifier": "org.p4pillon.pharma.desktop",
|
||||
"build": {
|
||||
"beforeDevCommand": {
|
||||
"cwd": "../../frontend",
|
||||
"script": "bun run dev"
|
||||
"cwd": "../app",
|
||||
"script": "cargo run"
|
||||
},
|
||||
"devUrl": "http://localhost:1420",
|
||||
"beforeBuildCommand": {
|
||||
"cwd": "../../frontend",
|
||||
"script": "bun run generate"
|
||||
},
|
||||
"frontendDist": "../../frontend/dist"
|
||||
"devUrl": "http://localhost:3000",
|
||||
"frontendDist": "axum://place.holder/"
|
||||
},
|
||||
"app": {
|
||||
"withGlobalTauri": true,
|
||||
"windows": [
|
||||
{
|
||||
"title": "Chrys4lide | LG0",
|
||||
"title": "Logiciel Pharma",
|
||||
"width": 800,
|
||||
"height": 600
|
||||
}
|
||||
@ -29,6 +25,9 @@
|
||||
},
|
||||
"bundle": {
|
||||
"active": true,
|
||||
"resources": {
|
||||
"../app/assets/": "./assets/"
|
||||
},
|
||||
"targets": "all",
|
||||
"icon": [
|
||||
"icons/32x32.png",
|
||||
@ -38,4 +37,5 @@
|
||||
"icons/icon.ico"
|
||||
]
|
||||
}
|
||||
|
||||
}
|
@ -1,18 +0,0 @@
|
||||
[package]
|
||||
name = "fsv-sys"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
links = "ssvlux64,ssvosx,Ssvw64"
|
||||
# Linux: Libssvlux64.so
|
||||
# Windows: Ssvw64.dll
|
||||
# macOS: ssvosx.framework
|
||||
|
||||
[dependencies]
|
||||
libc = "0.2.159"
|
||||
libloading = "0.8.5"
|
||||
|
||||
thiserror.workspace = true
|
||||
|
||||
[build-dependencies]
|
||||
bindgen = "0.70.1"
|
@ -1,32 +0,0 @@
|
||||
# État d'avancement de l'implémentation des bindings FSV
|
||||
|
||||
| Module | Progression |
|
||||
|-------------|------------------------------------|
|
||||
| [SSV](#ssv) | ![](https://geps.dev/progress/5) |
|
||||
| [SGD](#sgd) | ![](https://geps.dev/progress/0) |
|
||||
| [SRT](#srt) | ![](https://geps.dev/progress/0) |
|
||||
| [STS](#sts) | ![](https://geps.dev/progress/0) |
|
||||
|
||||
## SSV
|
||||
|
||||
| Fonctions implémentées |
|
||||
|------------------------|
|
||||
| SSV_InitLIB2 |
|
||||
| SSV_LireConfig |
|
||||
| SSV_LireCartePS |
|
||||
|
||||
## SGD
|
||||
|
||||
| Fonctions implémentées |
|
||||
|------------------------|
|
||||
|
||||
|
||||
## SRT
|
||||
|
||||
| Fonctions implémentées |
|
||||
|------------------------|
|
||||
|
||||
## STS
|
||||
|
||||
| Fonctions implémentées |
|
||||
|------------------------|
|
@ -1,36 +0,0 @@
|
||||
# FSV-sys, bindings Rust pour le package FSV SESAM-Vitale
|
||||
|
||||
## Librairies FSV
|
||||
|
||||
### Versions supportées
|
||||
|
||||
| Version FSV |
|
||||
|-------------|
|
||||
| 1.40.14 |
|
||||
| 1.40.13 |
|
||||
|
||||
### État d'avancement de l'implémentation des bindings FSV
|
||||
|
||||
Les détails de l'avancement de l'implémentation des bindings FSV sont donnés dans le fichier [PROGRESS.md](PROGRESS.md)
|
||||
|
||||
## Utilisation
|
||||
|
||||
### Pré-requis
|
||||
|
||||
- Installer le [package FSV](https://industriels.sesam-vitale.fr/group/fournitures-sesam-vitale)
|
||||
- Les librairies dynamiques (.lib, .dll, ...) fournies ne sont pas installés dans les emplacements standard du système, il faudra donc configurer leur chemin d'installation dans le fichier de configuration `.env.build` (voir ci-dessous)
|
||||
- Le détail des chemins d'installation est donné dans la documentation du package FSV `fsv-mi-004_pack-FSV1.40.14_V2.3.pdf`
|
||||
- Linux - par défaut : `/opt/santesocial/fsv/1.40.13/lib`
|
||||
- Windows - par défaut : `C:\Program Files\santesocial\santesocial\fsv\1.40.14\lib` (ou dans Program Files (x86) si c'est le package 32bits qui a été installé)
|
||||
|
||||
- Installer la [CryptolibCPS](https://industriels.sesam-vitale.fr/group/galss-cryptolib-cps)
|
||||
- Ce package fourni également l'utilitaire "CPS Gestion" pour obtenir des informations sur le lecteur de carte, etc.
|
||||
- Linux : `cpgeslux`
|
||||
- Windows : `...`
|
||||
|
||||
## Développement
|
||||
|
||||
### Pré-requis
|
||||
|
||||
- Pour la génération des bindings lors de la phase de `build` à l'aide de `bindgen`, il est nécessaire d'avoir installé `clang` ([documentation](https://rust-lang.github.io/rust-bindgen/requirements.html)).
|
||||
|
@ -1,7 +0,0 @@
|
||||
#ifndef WRAPPER_LINUX_H
|
||||
#define WRAPPER_LINUX_H
|
||||
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/linux/mc_sys_def.h"
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.13/ssv.h"
|
||||
|
||||
#endif // WRAPPER_LINUX_H
|
@ -1,7 +0,0 @@
|
||||
#ifndef WRAPPER_MACOSX_H
|
||||
#define WRAPPER_MACOSX_H
|
||||
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/macosx/mc_sys_def.h"
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.13/ssv.h"
|
||||
|
||||
#endif // WRAPPER_MACOSX_H
|
@ -1,7 +0,0 @@
|
||||
#ifndef WRAPPER_WIN_H
|
||||
#define WRAPPER_WIN_H
|
||||
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/win/mc_sys_def.h"
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.13/ssv.h"
|
||||
|
||||
#endif // WRAPPER_WIN_H
|
@ -1,7 +0,0 @@
|
||||
#ifndef WRAPPER_LINUX_H
|
||||
#define WRAPPER_LINUX_H
|
||||
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/linux/mc_sys_def.h"
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.14/ssv.h"
|
||||
|
||||
#endif // WRAPPER_LINUX_H
|
@ -1,7 +0,0 @@
|
||||
#ifndef WRAPPER_MACOSX_H
|
||||
#define WRAPPER_MACOSX_H
|
||||
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/macosx/mc_sys_def.h"
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.14/ssv.h"
|
||||
|
||||
#endif // WRAPPER_MACOSX_H
|
@ -1,7 +0,0 @@
|
||||
#ifndef WRAPPER_WIN_H
|
||||
#define WRAPPER_WIN_H
|
||||
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/win/mc_sys_def.h"
|
||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.14/ssv.h"
|
||||
|
||||
#endif // WRAPPER_WIN_H
|
@ -1,57 +0,0 @@
|
||||
use std::{env, path::PathBuf};
|
||||
|
||||
// Supported versions of FSV
|
||||
static SUPPORTED_FSV_VERSIONS: [&str; 2] = ["1.40.14", "1.40.13"];
|
||||
|
||||
fn build_bindings(version: &str, target_code: &str) -> PathBuf {
|
||||
let target = env::var("TARGET").expect("TARGET not set");
|
||||
let wrapper_path = format!("bindgen-wrappers/{}/wrapper.{}.h", version, target_code);
|
||||
let bindings = bindgen::Builder::default()
|
||||
// The input header we would like to generate
|
||||
// bindings for.
|
||||
.header(wrapper_path)
|
||||
// To generate the bindings for specific target
|
||||
.clang_arg(format!("--target={}", target))
|
||||
// Limit the bindings generation to the SSV_ prefix
|
||||
.allowlist_item("SSV_.*")
|
||||
// Tell cargo to invalidate the built crate whenever any of the
|
||||
// included header files changed.
|
||||
.parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
|
||||
// Finish the builder and generate the bindings.
|
||||
.generate()
|
||||
// Unwrap the Result and panic on failure.
|
||||
.expect("Unable to generate bindings");
|
||||
|
||||
// Write the bindings to the $OUT_DIR/bindings.rs file.
|
||||
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
|
||||
let out_file = format!("bindings_{}.rs", version);
|
||||
let out_path = out_dir.join(out_file);
|
||||
bindings
|
||||
.write_to_file(&out_path)
|
||||
.expect("Couldn't write bindings! ");
|
||||
out_path
|
||||
}
|
||||
|
||||
fn get_target_code() -> String {
|
||||
// Use CARGO configuration env Variable, because !cfg(target_os) is not available in build.rs
|
||||
// Source: https://kazlauskas.me/entries/writing-proper-buildrs-scripts
|
||||
let target_os = env::var("CARGO_CFG_TARGET_OS");
|
||||
|
||||
match target_os.as_ref().map(|x| &**x) {
|
||||
Ok("linux") => "linux", // lib_name = "ssvlux64";
|
||||
Ok("windows") => "win", // lib_name = "Ssvw64";
|
||||
Ok("macos") => "macosx", // lib_name = "ssvosx";
|
||||
tos => panic!("Unsupported target_os {:?}", tos),
|
||||
}
|
||||
.to_string()
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let target_code = get_target_code();
|
||||
// Build the bindings for each supported version of FSV
|
||||
let bindings_paths: Vec<PathBuf> = SUPPORTED_FSV_VERSIONS
|
||||
.iter()
|
||||
.map(|version| build_bindings(version, &target_code))
|
||||
.collect();
|
||||
println!("FSV bindings generated: {:#?}", bindings_paths);
|
||||
}
|
@ -1,12 +0,0 @@
|
||||
#![allow(non_upper_case_globals)]
|
||||
#![allow(non_camel_case_types)]
|
||||
#![allow(non_snake_case)]
|
||||
#![allow(unused)]
|
||||
|
||||
pub mod BINDINGS_V1_40_14 {
|
||||
include!(concat!(env!("OUT_DIR"), "/bindings_1.40.14.rs"));
|
||||
}
|
||||
|
||||
pub mod BINDINGS_V1_40_13 {
|
||||
include!(concat!(env!("OUT_DIR"), "/bindings_1.40.13.rs"));
|
||||
}
|
@ -1,212 +0,0 @@
|
||||
#![allow(non_snake_case)]
|
||||
|
||||
use std::marker::PhantomData;
|
||||
|
||||
mod bindings;
|
||||
use bindings::*;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum SupportedFsvVersion {
|
||||
V1_40_14, // 1.40.14
|
||||
V1_40_13, // 1.40.13
|
||||
}
|
||||
|
||||
impl SupportedFsvVersion {
|
||||
fn as_str(&self) -> &'static str {
|
||||
match self {
|
||||
Self::V1_40_14 => "1.40.14",
|
||||
Self::V1_40_13 => "1.40.13",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(thiserror::Error, Debug)]
|
||||
pub enum Error {
|
||||
#[error(transparent)]
|
||||
LibLoading(#[from] libloading::Error),
|
||||
#[error("Symbol missing: {0}")]
|
||||
SymbolMissing(&'static str),
|
||||
}
|
||||
|
||||
/// Macro to generate a function that implements a call to an external function in BINDINGS
|
||||
macro_rules! ssv_function {
|
||||
($binding:ty, $func_name:ident, {$($arg_name:ident: $arg_type:ty),*}) => {
|
||||
/// # Safety
|
||||
/// This function is unsafe because it calls an external function through FFI.
|
||||
/// The caller must ensure that the provided arguments are valid and that the
|
||||
/// external function is safe to call.
|
||||
pub unsafe fn $func_name(&self, $($arg_name: $arg_type),*) -> Result<u16, Error> {
|
||||
let symbol_name = match stringify!($binding)
|
||||
.split(&[' ', ':'])
|
||||
.last() {
|
||||
Some(name) => name,
|
||||
None => return Err(Error::SymbolMissing(stringify!($binding))),
|
||||
};
|
||||
let func_struct: libloading::Symbol<'_, $binding> =
|
||||
unsafe { self.library.get(symbol_name.as_bytes())? };
|
||||
let func = match *func_struct {
|
||||
Some(func) => func,
|
||||
None => return Err(Error::SymbolMissing(stringify!($binding))),
|
||||
};
|
||||
Ok(func($($arg_name),*))
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/// `sealed::Sealed` trait is used to prevent external crates from implementing the LibVersion trait.
|
||||
mod sealed { pub trait Sealed {}}
|
||||
|
||||
/// Wrapper around the SESAM-VITALE library
|
||||
/// This struct is responsible for loading the library and providing an interface to call its functions.
|
||||
/// The library is loaded at creation and kept in memory until the struct is dropped.
|
||||
pub trait SSVLibraryCommon {
|
||||
fn new(path: &str) -> Result<Self, Error> where Self: Sized;
|
||||
}
|
||||
|
||||
pub trait SSVLibraryVersion: sealed::Sealed {}
|
||||
|
||||
pub struct V1_40_13 {}
|
||||
impl sealed::Sealed for V1_40_13 {}
|
||||
impl SSVLibraryVersion for V1_40_13 {}
|
||||
|
||||
pub struct V1_40_14 {}
|
||||
impl sealed::Sealed for V1_40_14 {}
|
||||
impl SSVLibraryVersion for V1_40_14 {}
|
||||
|
||||
pub struct SSVLibrary<Version: SSVLibraryVersion> {
|
||||
_version: PhantomData<Version>,
|
||||
library: libloading::Library,
|
||||
}
|
||||
|
||||
impl<Version: SSVLibraryVersion> SSVLibraryCommon for SSVLibrary<Version> {
|
||||
fn new(path: &str) -> Result<Self, Error> {
|
||||
let library = unsafe { libloading::Library::new(path)?};
|
||||
Ok(Self {
|
||||
_version: PhantomData,
|
||||
library
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl SSVLibrary<V1_40_14> {
|
||||
pub fn library(&self) -> &libloading::Library {
|
||||
&self.library
|
||||
}
|
||||
|
||||
ssv_function!(BINDINGS_V1_40_14::SSV_InitLIB2, ssv_init_lib2, {
|
||||
pcFichierSesam: *const i8
|
||||
});
|
||||
|
||||
ssv_function!(BINDINGS_V1_40_14::SSV_LireConfig, ssv_lire_config, {
|
||||
pZDataOut: *mut *mut libc::c_void,
|
||||
psTailleDataOut: *mut usize
|
||||
});
|
||||
|
||||
ssv_function!(BINDINGS_V1_40_14::SSV_LireCartePS, ssv_lire_carte_ps, {
|
||||
NomRessourcePS: *const i8,
|
||||
NomRessourceLecteur: *const i8,
|
||||
CodePorteurPS: *const i8,
|
||||
pZDataOut: *mut *mut libc::c_void,
|
||||
pTailleZone: *mut usize
|
||||
});
|
||||
}
|
||||
|
||||
impl SSVLibrary<V1_40_13> {
|
||||
ssv_function!(BINDINGS_V1_40_13::SSV_InitLIB2, ssv_init_lib2, {
|
||||
pcFichierSesam: *const i8
|
||||
});
|
||||
|
||||
ssv_function!(BINDINGS_V1_40_13::SSV_LireConfig, ssv_lire_config, {
|
||||
pZDataOut: *mut *mut libc::c_void,
|
||||
psTailleDataOut: *mut usize
|
||||
});
|
||||
|
||||
ssv_function!(BINDINGS_V1_40_13::SSV_LireCartePS, ssv_lire_carte_ps, {
|
||||
NomRessourcePS: *const i8,
|
||||
NomRessourceLecteur: *const i8,
|
||||
CodePorteurPS: *const i8,
|
||||
pZDataOut: *mut *mut libc::c_void,
|
||||
pTailleZone: *mut usize
|
||||
});
|
||||
}
|
||||
|
||||
pub fn get_library_path(version: &SupportedFsvVersion) -> String {
|
||||
let root_path = get_library_root_path();
|
||||
let library_name = get_library_name();
|
||||
let version = version.as_str();
|
||||
format!("{root_path}/{version}/lib/{library_name}")
|
||||
}
|
||||
|
||||
pub fn sesam_ini_path(version: &SupportedFsvVersion) -> String {
|
||||
let root_path = get_sesam_ini_root_path();
|
||||
let version = version.as_str();
|
||||
format!("{root_path}/{version}/conf/sesam.ini")
|
||||
}
|
||||
|
||||
fn get_library_name() -> &'static str {
|
||||
// TODO : Use libloading::library_filename to get platform-specific filename ?
|
||||
"libssvlux64.so"
|
||||
}
|
||||
|
||||
fn get_library_root_path() -> &'static str {
|
||||
"/opt/santesocial/fsv"
|
||||
}
|
||||
|
||||
fn get_sesam_ini_root_path() -> &'static str {
|
||||
"/etc/opt/santesocial/fsv"
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use std::{ffi::CString, ptr};
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_initlib2() {
|
||||
let lib_path = &get_library_path(&SupportedFsvVersion::V1_40_13);
|
||||
let ssv_library = SSVLibrary::<V1_40_13>::new(lib_path).expect("SSVLibrary::new failed");
|
||||
|
||||
let sesam_ini_str =
|
||||
CString::new(sesam_ini_path(&SupportedFsvVersion::V1_40_13)).expect("CString::new failed");
|
||||
let result = unsafe { ssv_library.ssv_init_lib2(sesam_ini_str.as_ptr()) }.unwrap();
|
||||
assert_eq!(result, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_lire_config_and_carte_ps() {
|
||||
let lib_path = &get_library_path(&SupportedFsvVersion::V1_40_13);
|
||||
let ssv_library = SSVLibrary::<V1_40_13>::new(lib_path).expect("SSVLibrary::new failed");
|
||||
|
||||
let sesam_ini_str =
|
||||
CString::new(sesam_ini_path(&SupportedFsvVersion::V1_40_13)).expect("CString::new failed");
|
||||
let result = unsafe { ssv_library.ssv_init_lib2(sesam_ini_str.as_ptr()) }.unwrap();
|
||||
assert_eq!(result, 0);
|
||||
|
||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||
let mut size: libc::size_t = 0;
|
||||
let result = unsafe { ssv_library.ssv_lire_config(&mut buffer_ptr, &mut size) }.unwrap();
|
||||
assert_eq!(result, 0);
|
||||
unsafe { libc::free(buffer_ptr) };
|
||||
|
||||
let nom_ressource_ps =
|
||||
CString::new("Gemalto PC Twin Reader (645D94C3) 00 00").expect("CString::new failed");
|
||||
let nom_ressource_lecteur =
|
||||
CString::new("Gemalto PC Twin Reader (645D94C3) 00 00").expect("CString::new failed");
|
||||
let code_porteur_ps = CString::new("1234").expect("CString::new failed");
|
||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||
let mut size: libc::size_t = 0;
|
||||
let result = unsafe {
|
||||
ssv_library.ssv_lire_carte_ps(
|
||||
nom_ressource_ps.as_ptr(),
|
||||
nom_ressource_lecteur.as_ptr(),
|
||||
code_porteur_ps.as_ptr(),
|
||||
&mut buffer_ptr,
|
||||
&mut size,
|
||||
)
|
||||
}
|
||||
.unwrap();
|
||||
assert_eq!(result, 0);
|
||||
unsafe { libc::free(buffer_ptr) };
|
||||
}
|
||||
}
|
@ -1,123 +0,0 @@
|
||||
/*
|
||||
* -------------------------------------------------------------------
|
||||
* (c) 2001 GIE SESAM-VITALE
|
||||
*
|
||||
* PROJET : Services de Gestion de Donnees
|
||||
*
|
||||
* FICHIER : sgd.h (v4)
|
||||
*
|
||||
* Declaration des prototypes des fonctions SGD pour les progiciels.
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ifndef __SGD_H__
|
||||
#define __SGD_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Inclusions
|
||||
*/
|
||||
#include <stddef.h>
|
||||
#include "mc_sys_def.h"
|
||||
|
||||
/* Reservation d'un session d'echange. */
|
||||
extern unsigned short API_ENTRY SGD_ReserverSession (size_t Taille, unsigned short* NumeroSession);
|
||||
|
||||
/* Redimensionnement d'une zone d'entree interne. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_RedimensionnerBuffer (unsigned short NumeroSession,
|
||||
size_t NouvelleTaille);
|
||||
|
||||
/* Liberation d'une session d'echange. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_LibererSession (unsigned short NumeroSession);
|
||||
|
||||
/* Ajout d'un groupe. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_AjouterGroupe (unsigned short NumeroSession,
|
||||
unsigned short IdGroupe);
|
||||
|
||||
/* Ajout d'un champ. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_AjouterChamp (unsigned short NumeroSession,
|
||||
const char* ValeurChamp);
|
||||
|
||||
/* Ajout d'un champ d'octets. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_AjouterChampBin (unsigned short NumeroSession,
|
||||
const char* ValeurChamp,
|
||||
size_t TailleChamp);
|
||||
|
||||
/* Ajout d'un champ d'octets d'un Fichier. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_AjouterChampFichier (unsigned short NumeroSession,
|
||||
const char* NomFichier);
|
||||
|
||||
/* Lecture du numero du groupe suivant. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_LireGroupeSuivant (unsigned short NumeroSession,
|
||||
unsigned short IdGroupeCourant,
|
||||
unsigned short OccurrenceGroupeCourant,
|
||||
unsigned short* IdGroupeSuivant,
|
||||
unsigned short* OccurrenceGroupeSuivant);
|
||||
|
||||
/* Lecture d'un champ. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_LireChamp (unsigned short NumeroSession,
|
||||
unsigned short IdGroupe,
|
||||
unsigned short OccurrenceGroupe,
|
||||
unsigned short NumeroChamp,
|
||||
char* ValeurChamp,
|
||||
size_t* TailleMax);
|
||||
|
||||
/* Lecture d'un champ d'octets. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_LireChampBin (unsigned short NumeroSession,
|
||||
unsigned short IdGroupe,
|
||||
unsigned short OccurrenceGroupe,
|
||||
unsigned short NumeroChamp,
|
||||
char* ValeurChamp,
|
||||
size_t* TailleMax);
|
||||
|
||||
/* Lecture d'un champ vers un fichier. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_LireChampFichier (unsigned short NumeroSession,
|
||||
unsigned short IdGroupe,
|
||||
unsigned short OccurrenceGroupe,
|
||||
unsigned short NumeroChamp,
|
||||
const char* NomFichier);
|
||||
|
||||
/* Activation de la trace. */
|
||||
extern unsigned short API_ENTRY
|
||||
SGD_InitTrace (const char* NomFichier,
|
||||
const char* ModeOuverture,
|
||||
unsigned short Module,
|
||||
unsigned char Niveau);
|
||||
|
||||
/*Initialisation de SGD*/
|
||||
unsigned short API_ENTRY SGD_Init(const char *fichierSesam);
|
||||
|
||||
/* Transmission de la zone d'entrée. */
|
||||
extern unsigned short API_ENTRY SGD_LireZoneIn(unsigned short NumeroSession,
|
||||
void** ZDonneesEntree,
|
||||
size_t* TailleDonneesEntree);
|
||||
|
||||
/* Transmission de la zone de sortie. */
|
||||
typedef void (API_ENTRY *LibererZoneMem) (void* Zone);
|
||||
|
||||
|
||||
extern unsigned short API_ENTRY SGD_EcrireZoneOut(unsigned short NumeroSession,
|
||||
void* ZDonneesSortie,
|
||||
size_t TailleDonneesSortie,
|
||||
LibererZoneMem Fonction);
|
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,176 +0,0 @@
|
||||
/*
|
||||
* -------------------------------------------------------------------
|
||||
* (c) 2001-2003 GIE SESAM-VITALE
|
||||
*
|
||||
* PROJET : Services Reglementation et Tarification
|
||||
*
|
||||
* FICHIER : srt.h (v5)
|
||||
*
|
||||
* Declaration des prototypes des fonctions SRT
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ifndef __SRT_H__
|
||||
#define __SRT_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Inclusions
|
||||
*/
|
||||
#include <stddef.h>
|
||||
/* Inclure le fichier de déclarations spécifiques système : win32def.h, macosdef.h, unixdef.h, etc. */
|
||||
|
||||
|
||||
/*
|
||||
* Declarations des fonctions publiques "standards"
|
||||
*/
|
||||
|
||||
/* Recherche de codes CCAM par mot cle. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_RechercherParMotCle)
|
||||
(const char* MotCle,
|
||||
unsigned long CadreRecherche,
|
||||
void** ZDonneesSortie,
|
||||
size_t* TailleDonneesSortie);
|
||||
|
||||
/* Recherche de codes CCAM par filtre. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_RechercherParFiltre)
|
||||
(const char* Filtre,
|
||||
void** ZDonneesSortie,
|
||||
size_t* TailleDonneesSortie);
|
||||
|
||||
/* Consultation de donnees CCAM. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_ConsulterDonnee)
|
||||
(const char* Identifiant,
|
||||
const char* DateReference,
|
||||
void* ZDonneesEntree,
|
||||
size_t TailleDonneesEntree,
|
||||
void** ZDonneesSortie,
|
||||
size_t* TailleDonneesSortie);
|
||||
|
||||
/* Modification d'un champ mono-occurrent. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_ModifierDonnee)
|
||||
(const char* Identifiant,
|
||||
const char* DateEffet,
|
||||
void* ZDonneesEntree,
|
||||
size_t TailleDonneesEntree);
|
||||
|
||||
/* Annulation d'une modification */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_AnnulerModification)
|
||||
(const char* Identifiant,
|
||||
void* ZDonneesEntree,
|
||||
size_t TailleDonneesEntree);
|
||||
|
||||
/* Controle de la validite d'une ou plusieurs donnees. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_ControlerDonnees)
|
||||
(const char* Identifiant,
|
||||
const char* DateReference,
|
||||
void* ZDonneesEntree,
|
||||
size_t TailleDonneesEntree,
|
||||
unsigned char* Resultat);
|
||||
|
||||
/* Regle de gestion ou de tarification. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_AppliquerRegle)
|
||||
(const char* Identifiant,
|
||||
void* ZDonneesEntree,
|
||||
size_t TailleDonneesEntree,
|
||||
void** ZDonneesSortie,
|
||||
size_t* TailleDonneesSortie);
|
||||
|
||||
/* Controle complet. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_ControleComplet)
|
||||
(void* ZDonneesEntree,
|
||||
size_t TailleDonneesEntree,
|
||||
void** ZDonneesSortie,
|
||||
size_t* TailleDonneesSortie);
|
||||
|
||||
/* Chargement du referentiel. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_InitLIB2)(const char* SesamIni);
|
||||
|
||||
/* Dechargement du referentiel. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_TermLIB)(void);
|
||||
|
||||
/* Sauvegarde des modifications. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_SauvegarderReferentiel)(const char* Commentaire);
|
||||
|
||||
/* Version du referentiel. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_LireVersion)
|
||||
(void** ZDonneesSortie,
|
||||
size_t* TailleDonneesSortie);
|
||||
|
||||
/* Activation de la trace. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_InitTrace)
|
||||
(const char* pathConf,
|
||||
const char* ModeOuverture,
|
||||
unsigned short Module,
|
||||
unsigned char Niveau);
|
||||
|
||||
/* Allocation d'une zone memoire. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_AllouerZoneMem)
|
||||
(void** Zone,
|
||||
size_t Taille);
|
||||
|
||||
/* Allocation d'une zone memoire. */
|
||||
typedef void (API_ENTRY FARPTR SRT_LibererZoneMem) (void* Zone);
|
||||
|
||||
/*
|
||||
* Declarations des fonctions publiques "simplifiees"
|
||||
*/
|
||||
|
||||
/* Recherche de codes CCAM par mot cle. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_RechercherParMotCle_S)
|
||||
(const char* MotCle,
|
||||
unsigned long CadreRecherche,
|
||||
unsigned short NumeroSession);
|
||||
|
||||
/* Recherche de codes CCAM par filtre. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_RechercherParFiltre_S)
|
||||
(const char* Filtre,
|
||||
unsigned short NumeroSession);
|
||||
|
||||
/* Consultation de donnees CCAM. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_ConsulterDonnee_S)
|
||||
(const char* Identifiant,
|
||||
const char* DateReference,
|
||||
unsigned short NumeroSession);
|
||||
|
||||
/* Modification d'un champ mono-occurrent. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_ModifierDonnee_S)
|
||||
(const char* Identifiant,
|
||||
const char* DateEffet,
|
||||
unsigned short NumeroSession);
|
||||
|
||||
/* Annulation des modifications d'une donnee. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_AnnulerModification_S)
|
||||
(const char* Identifiant,
|
||||
unsigned short NumeroSession);
|
||||
|
||||
/* Controle de la validite d'une ou plusieurs donnees. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_ControlerDonnees_S)
|
||||
(const char* Identifiant,
|
||||
const char* DateReference,
|
||||
unsigned short NumeroSession,
|
||||
unsigned char* Resultat);
|
||||
|
||||
/* Regle de gestion ou de tarification. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_AppliquerRegle_S)
|
||||
(const char* Identifiant,
|
||||
unsigned short NumeroSession);
|
||||
|
||||
/* Controle complet. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_ControleComplet_S)
|
||||
(unsigned short NumeroSession);
|
||||
|
||||
/* Version du referentiel. */
|
||||
typedef unsigned short (API_ENTRY FARPTR SRT_LireVersion_S)
|
||||
(unsigned short NumeroSession);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,327 +0,0 @@
|
||||
/*
|
||||
* -------------------------------------------------------------------
|
||||
* (c) 2001-2003 GIE SESAM-VITALE
|
||||
*
|
||||
* PROJET : Services SESAM Vitale
|
||||
*
|
||||
* FICHIER : ssv.h
|
||||
*
|
||||
* Declaration des prototypes des fonctions SSV
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ifndef __SSV_H__
|
||||
#define __SSV_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Inclusions
|
||||
*/
|
||||
#include <stddef.h>
|
||||
/* Inclure le fichier de déclarations spécifiques système :
|
||||
win32def.h, macosdef.h, aixdef.h, etc. */
|
||||
|
||||
|
||||
/****** FONCTIONS STANDARDS *********/
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_TraduireARL)
|
||||
(short NbZDataIn,
|
||||
void FARPTR FARPTR TZDataIn,
|
||||
size_t FARPTR TTailleZoneIn,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireCartePS)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireConfig)
|
||||
(void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR psTailleDataOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterFactures)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
char cFactureACreer,
|
||||
char cModeSecur,
|
||||
void FARPTR pZDataIn,
|
||||
size_t TailleDataIn,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterLot)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
short NBZDataIn,
|
||||
void FARPTR FARPTR TZDataIn,
|
||||
size_t FARPTR TTailleZoneIn,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterFichier)
|
||||
(void FARPTR pZDataIn,size_t TailleDataIn,
|
||||
void FARPTR FARPTR pZDataOut,size_t FARPTR pTailleZone);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_InitTrace)
|
||||
(char FARPTR pathConf, char FARPTR ModeOuverture,
|
||||
unsigned short Module, unsigned char Niveau);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_AllouerZoneMem)
|
||||
(void FARPTR FARPTR pZDataIn,
|
||||
size_t taille);
|
||||
|
||||
typedef void (API_ENTRY FARPTR SSV_LibererZoneMem)
|
||||
(void FARPTR pZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_MajDateLecteur)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcDateHeure);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireDateLecteur)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
char FARPTR pcDateHeure);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireDroitsVitale)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR DateConsultation,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZone);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_IdentifierTLA)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR NumVersionCDC,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR tailleDataOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFacturesPdT)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
short sNbZDataIn,
|
||||
void FARPTR FARPTR pvTZDataIn,
|
||||
size_t FARPTR psTTailleDataIn,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFSETLA)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFSETLANC)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_EffacerTLA)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR cNumFacturation,
|
||||
const char FARPTR cTypeDonnee);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerFacturesPdT)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcNumFacturation,
|
||||
short sNbZDataIn,
|
||||
void FARPTR FARPTR pvTZDataIn,
|
||||
size_t FARPTR psTTailleDataIn,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerAppli)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
short sNbZDataIn,
|
||||
void FARPTR FARPTR pvTZDataIn,
|
||||
size_t FARPTR psTTailleDataIn);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerDonneesTLA)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
short sNbZDataIn,
|
||||
void FARPTR FARPTR pvTZDataIn,
|
||||
size_t FARPTR psTTailleDataIn);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerBeneficiaires)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR cNumFacturation,
|
||||
short FARPTR sNbZDataOut,
|
||||
void FARPTR FARPTR pTZDataOut,
|
||||
size_t FARPTR sTTailleDataOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_TraduireFSE)
|
||||
(void FARPTR pZDataIn,
|
||||
size_t TailleDataIn,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_SecuriserFacture)
|
||||
(const char FARPTR pcNomRessourcePS,
|
||||
const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcCodePorteurPS,
|
||||
char cNologSituation,
|
||||
const char FARPTR pcNumFact,
|
||||
void FARPTR pvDataIn,
|
||||
size_t szTailleDataIn ,
|
||||
void FARPTR FARPTR pvDataOut,
|
||||
size_t FARPTR pszTailleDataOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_InitLIB2) (const char FARPTR pcFichierSesam);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_TermLIB)();
|
||||
|
||||
|
||||
|
||||
/****** FONCTIONS SIMPLIFIEES *********/
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_TraduireARL)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireCartePS)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireConfig)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterFactures)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
char cFacturesACreer,
|
||||
char ModeSecur,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterLot)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterFichier)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_InitTrace)
|
||||
(char FARPTR NomFichier, char FARPTR ModeOuverture,
|
||||
unsigned short Module, unsigned char Niveau);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_MajDateLecteur)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcDateHeure);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireDateLecteur)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
char FARPTR pcDateHeure);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireDroitsVitale)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR DateConsultation,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_IdentifierTLA)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR NumVersionCDC,
|
||||
unsigned short numeroSession );
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFacturesPdT)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFSETLA)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFSETLANC)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
unsigned short numeroSession);
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_EffacerTLA)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR cNumFacturation,
|
||||
const char FARPTR cTypeDonnee);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerFacturesPdT)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcNumFacturation,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerAppli)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerDonneesTLA)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerBeneficiaires)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR cNumFacturation,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_TraduireFSE)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_SecuriserFacture)
|
||||
( const char FARPTR pcNomRessourcePS,
|
||||
const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcCodePorteurPS,
|
||||
char cNologSituation,
|
||||
const char FARPTR pcNumFact,
|
||||
unsigned short numeroSession);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,412 +0,0 @@
|
||||
/*
|
||||
* -------------------------------------------------------------------
|
||||
* (c) 2001-2003 GIE SESAM-VITALE
|
||||
*
|
||||
* PROJET : Services SESAM Vitale
|
||||
*
|
||||
* FICHIER : ssv.h
|
||||
*
|
||||
* Declaration des prototypes des fonctions SSV
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ifndef __SSV_H__
|
||||
#define __SSV_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Inclusions
|
||||
*/
|
||||
#include <stddef.h>
|
||||
/* Inclure le fichier de déclarations spécifiques système :
|
||||
win32def.h, macosdef.h, aixdef.h, etc. */
|
||||
|
||||
|
||||
/****** FONCTIONS STANDARDS *********/
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_TraduireARL)
|
||||
(short NbZDataIn,
|
||||
void FARPTR FARPTR TZDataIn,
|
||||
size_t FARPTR TTailleZoneIn,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireCartePS)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireConfig)
|
||||
(void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR psTailleDataOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterFactures)
|
||||
(char cFactureACreer,
|
||||
char cModeSecur,
|
||||
char cTypeFlux,
|
||||
void FARPTR pZDataIn,
|
||||
size_t TailleDataIn,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChiffrerFacture)
|
||||
(void * pZDataIn,
|
||||
size_t TailleDataIn,
|
||||
void * * pZDataOut,
|
||||
size_t * pTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_SignerFactureVitale)
|
||||
(const char * pcNomRessourceVitale,
|
||||
void * pZDataIn,
|
||||
size_t szTailleDataIn,
|
||||
void * * pZDataOut,
|
||||
size_t * pszTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_CalculerHashFactureAssure)
|
||||
(const char * pcNumSerie,
|
||||
void * pZDataIn,
|
||||
size_t szTailleDataIn,
|
||||
void * * pZDataOut,
|
||||
size_t * pszTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_AjouterSignatureAssureDansFacture)
|
||||
(void * pZDataIn,
|
||||
size_t szTailleDataIn,
|
||||
void * * pZDataOut,
|
||||
size_t * pszTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_SignerFactureCPS)
|
||||
(const char * pcNomRessourcePS,
|
||||
const char * pcNomRessourceLecteur,
|
||||
const char * pcCodePorteurPS,
|
||||
char cNologSituation,
|
||||
void * pZDataIn,
|
||||
size_t szTailleDataIn,
|
||||
void * * pZDataOut,
|
||||
size_t * pszTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY SSV_CalculerHashFacturePS)
|
||||
(const char * pcNumSerieCPS,
|
||||
void * pZDataIn,
|
||||
size_t usTailleDataIn,
|
||||
void * * pZDataOut,
|
||||
size_t * pusTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY SSV_AjouterSignaturePSFacture)
|
||||
(void * pZDataIn,
|
||||
size_t szTailleDataIn,
|
||||
void * * pZDataOut,
|
||||
size_t * pszTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_SignerLotCPS)
|
||||
(const char * pcNomRessourcePS,
|
||||
const char * pcNomRessourceLecteur,
|
||||
const char * pcCodePorteurPS,
|
||||
char cNologSituation,
|
||||
void * pZDataIn,
|
||||
size_t szTailleDataIn,
|
||||
void * * pZDataOut,
|
||||
size_t * pszTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterLot)
|
||||
( short NBZDataIn,
|
||||
void FARPTR FARPTR TZDataIn,
|
||||
size_t FARPTR TTailleZoneIn,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterFichier)
|
||||
(void FARPTR pZDataIn,size_t TailleDataIn,
|
||||
void FARPTR FARPTR pZDataOut,size_t FARPTR pTailleZone);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_InitTrace)
|
||||
(char FARPTR pathConf, char FARPTR ModeOuverture,
|
||||
unsigned short Module, unsigned char Niveau);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_AllouerZoneMem)
|
||||
(void FARPTR FARPTR pZDataIn,
|
||||
size_t taille);
|
||||
|
||||
typedef void (API_ENTRY FARPTR SSV_LibererZoneMem)
|
||||
(void FARPTR pZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_MajDateLecteur)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcDateHeure);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireDateLecteur)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
char FARPTR pcDateHeure);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireDroitsVitale)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR DateConsultation,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZone);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_IdentifierTLA)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR NumVersionCDC,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR tailleDataOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFacturesPdT)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
short sNbZDataIn,
|
||||
void FARPTR FARPTR pvTZDataIn,
|
||||
size_t FARPTR psTTailleDataIn,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFSETLA)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFSETLANC)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_EffacerTLA)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR cNumFacturation,
|
||||
const char FARPTR cTypeDonnee);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerFacturesPdT)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcNumFacturation,
|
||||
short sNbZDataIn,
|
||||
void FARPTR FARPTR pvTZDataIn,
|
||||
size_t FARPTR psTTailleDataIn,
|
||||
short FARPTR pNbZDataOut,
|
||||
void FARPTR FARPTR TZDataOut,
|
||||
size_t FARPTR TTailleZoneOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerAppli)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
short sNbZDataIn,
|
||||
void FARPTR FARPTR pvTZDataIn,
|
||||
size_t FARPTR psTTailleDataIn);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerDonneesTLA)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
short sNbZDataIn,
|
||||
void FARPTR FARPTR pvTZDataIn,
|
||||
size_t FARPTR psTTailleDataIn);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerBeneficiaires)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR cNumFacturation,
|
||||
short FARPTR sNbZDataOut,
|
||||
void FARPTR FARPTR pTZDataOut,
|
||||
size_t FARPTR sTTailleDataOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_TraduireFSE)
|
||||
(void FARPTR pZDataIn,
|
||||
size_t TailleDataIn,
|
||||
void FARPTR FARPTR pZDataOut,
|
||||
size_t FARPTR pTailleZone);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_SecuriserFacture)
|
||||
(const char FARPTR pcNomRessourcePS,
|
||||
const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcCodePorteurPS,
|
||||
char cNologSituation,
|
||||
const char FARPTR pcNumFact,
|
||||
void FARPTR pvDataIn,
|
||||
size_t szTailleDataIn ,
|
||||
void FARPTR FARPTR pvDataOut,
|
||||
size_t FARPTR pszTailleDataOut);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_InitLIB2) (const char FARPTR pcFichierSesam);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SSV_TermLIB)();
|
||||
|
||||
|
||||
|
||||
/****** FONCTIONS SIMPLIFIEES *********/
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_TraduireARL)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireCartePS)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireConfig)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterFactures)
|
||||
(char cFacturesACreer,
|
||||
char ModeSecur,
|
||||
char cTypeFlux,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChiffrerFacture)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_SignerFactureVitale)
|
||||
(const char * pcNomRessourceVitale,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_CalculerHashFactureAssure)
|
||||
(const char * pcNumSerie,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_AjouterSignatureAssureDansFacture)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_SignerFactureCPS)
|
||||
(const char * pcNomRessourcePS,
|
||||
const char * pcNomRessourceLecteur,
|
||||
const char * pcCodePorteurPS,
|
||||
char cNologSituation,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (SIS_CalculerHashFacturePS)
|
||||
(const char * pcNumSerieCPS,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY SIS_AjouterSignaturePSFacture)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_SignerLotCPS)
|
||||
(const char * pcNomRessourcePS,
|
||||
const char * pcNomRessourceLecteur,
|
||||
const char * pcCodePorteurPS,
|
||||
char cNologSituation,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterLot)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterFichier)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_InitTrace)
|
||||
(char FARPTR NomFichier, char FARPTR ModeOuverture,
|
||||
unsigned short Module, unsigned char Niveau);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_MajDateLecteur)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcDateHeure);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireDateLecteur)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
char FARPTR pcDateHeure);
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireDroitsVitale)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR DateConsultation,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_IdentifierTLA)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR NumVersionCDC,
|
||||
unsigned short numeroSession );
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFacturesPdT)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFSETLA)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFSETLANC)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR pcNumFact,
|
||||
unsigned short numeroSession);
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_EffacerTLA)
|
||||
(const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR cNumFacturation,
|
||||
const char FARPTR cTypeDonnee);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerFacturesPdT)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcNumFacturation,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerAppli)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerDonneesTLA)
|
||||
(const char FARPTR pcNomRessourceLecteur,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerBeneficiaires)
|
||||
( const char FARPTR NomRessourcePS,
|
||||
const char FARPTR NomRessourceLecteur,
|
||||
const char FARPTR CodePorteurPS,
|
||||
const char FARPTR cNumFacturation,
|
||||
unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_TraduireFSE)
|
||||
(unsigned short numeroSession);
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SIS_SecuriserFacture)
|
||||
( const char FARPTR pcNomRessourcePS,
|
||||
const char FARPTR pcNomRessourceLecteur,
|
||||
const char FARPTR pcCodePorteurPS,
|
||||
char cNologSituation,
|
||||
const char FARPTR pcNumFact,
|
||||
unsigned short numeroSession);
|
||||
|
||||
|
||||
/* inclusion temporaire dans ssv.h pour ne pas a avoir à relivrer Sedica (pas d'incidence sur le code) -> à inclure dans sedica.h ou commun.h*/
|
||||
/* Chaine discriminante d un nom de ressource TL PCSC */
|
||||
#define TL_PCSC " TL "
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,353 +0,0 @@
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% PROJET : STS INTERFACE
|
||||
%
|
||||
% MODULE : HEADER STS INTERFACE
|
||||
%
|
||||
% VERSION : cf #define ci-après
|
||||
%
|
||||
% FICHIER : sts.h
|
||||
%
|
||||
% Déclaration des prototypes des fonctions STS - INTERFACE
|
||||
%-----------------------------------------------------------------------------
|
||||
%
|
||||
% EDS DHU - 09/04/03 - Création du .h
|
||||
%
|
||||
% EDS OCL - 06/06/03 - Defect 91 : Rectification du prototype de InitTrace()
|
||||
%
|
||||
% EDS OCL - 04/07/03 - Defect 115 : Nettoyage de stsitf.h (devenu sts.h)
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ifndef __STSITF_H
|
||||
#define __STSITF_H
|
||||
#define __STSITF_VERSION "0103"
|
||||
/* Ne pas oublier d'impacter idef.h aussi */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
% Bibliothèques ANSI ou système
|
||||
%------------------------------
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
% Fichiers h inclus
|
||||
%------------------
|
||||
*/
|
||||
|
||||
#include "sys_dep.h"
|
||||
/*
|
||||
% Macros et Constantes
|
||||
%---------------------
|
||||
*/
|
||||
|
||||
/* OCL - Defect 115 : Suppression du #define G_xxx ici même */
|
||||
|
||||
/* OCL - Defect 115 : Suppression du second #ifdef _cplusplus ici même */
|
||||
|
||||
|
||||
/*********************************************************************************
|
||||
************************* Fonctions réentrantes *********************************
|
||||
*********************************************************************************/
|
||||
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_Tarification
|
||||
%
|
||||
% Rôle : Tarification de la part complémentaire des actes de la facture
|
||||
%
|
||||
% Paramètres d'entrée :
|
||||
% MotifAppel (char) : 1er appel ('P') ou Appel sur echec de
|
||||
% tarification ('E').
|
||||
% ZDonneesEntree (void*) : Zone d'échange fournie par le Progiciel
|
||||
% contenant toutes les informations sur la facture
|
||||
% TailleDonneesEntree (size_t) : Taille de la zone d'échange Zin
|
||||
%
|
||||
% Paramètres de sortie :
|
||||
% ZDonneesSortie (void**) : Zone d'échange fournie par le module STS appelé
|
||||
% contenant toutes les informations modifiées de la facture
|
||||
% en entrée et de nouvelles informations.
|
||||
% TailleDonneesSortie (size_t*) : Taille de la zone d'échange Zout
|
||||
%
|
||||
% Valeur retournée :
|
||||
% OK si pas d'erreur
|
||||
% ERR_STS_NON_INITIALISE si module STS non initialisé
|
||||
% et les codes d'erreurs de la tarification du module STS appelé
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_Tarification)(char MotifAppel, void FARPTR ZDonneesEntree,
|
||||
size_t TailleDonneesEntree, void FARPTR FARPTR ZDonneesSortie,
|
||||
size_t FARPTR TailleDonneesSortie);
|
||||
|
||||
/* Fonction simplifiée */
|
||||
/* OCL - Defect 115 : Remplacement STS_SIM par SGD */
|
||||
#ifdef SGD
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_Tarification_S)(char MotifAppel, unsigned short NumeroSession);
|
||||
#endif
|
||||
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_Assistance
|
||||
%
|
||||
% Rôle : Assistance à la facturation.
|
||||
%
|
||||
% Paramètres d'entrée :
|
||||
% MotifAppel (char) : 1er appel ('P') ou Appel sur echec de
|
||||
% tarification ('E').
|
||||
% PorteeAppel (ushort) : 0 pour une assistance sur toute la facture.
|
||||
% 1..n pour une assistance sur un acte de rang donné /zone
|
||||
% ZDonneesEntree (void*) : Zone d'échange fournie par le Progiciel
|
||||
% contenant toutes les informations sur la facture
|
||||
% TailleDonneesEntree (size_t) : Taille de la zone d'échange Zin
|
||||
%
|
||||
% Paramètres de sortie :
|
||||
% ZDonneesSortie (void**) : Zone d'échange fournie par le module STS appelé
|
||||
% TailleDonneesSortie (size_t*) : Taille de la zone d'échange Zout
|
||||
%
|
||||
% Valeur retournée : (idem Tarification)
|
||||
% OK si pas d'erreur
|
||||
% ERR_STS_NON_INITIALISE si module STS non initialisé
|
||||
% et les codes d'erreurs de la tarification du module STS appelé
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_Assistance)(char MotifAppel, unsigned short PorteeAppel,
|
||||
void FARPTR ZDonneesEntree, size_t TailleDonneesEntree,
|
||||
void FARPTR FARPTR ZDonneesSortie, size_t FARPTR TailleDonneesSortie);
|
||||
|
||||
/* Fonction simplifiée */
|
||||
#ifdef SGD
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_Assistance_S)(char MotifAppel, unsigned short PorteeAppel,
|
||||
unsigned short NumeroSession);
|
||||
#endif
|
||||
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_LireVersion
|
||||
%
|
||||
% Rôle : Lecture de la version de ce module et du fichier de ces tables externes
|
||||
% dans le groupe 3780. Appeller la lecture de version de chaque module STS
|
||||
% puis recopier la réponse 3780 de chacun dans la zone de sortie.
|
||||
%
|
||||
% Paramètres d'entrée : aucun
|
||||
%
|
||||
% Paramètres de sortie :
|
||||
% ZDonneesSortie (void**) : Zone d'échange fournie par ce module
|
||||
% contenant les versions (grp 3780) demandées.
|
||||
% TailleDonneesSortie (size_t*) : Taille de la zone d'échange Zout
|
||||
%
|
||||
% Valeur retournée :
|
||||
% OK si pas d'erreur
|
||||
% ERR_STS_NON_INITIALISE si module STS non initialisé
|
||||
% ERR_ZOUT si ZDonneesSortie==NULL ou TailleDonneesSortie==NULL
|
||||
% ERR_ZONE_ALLOC si mémoire insuffisante pour allouer la Zout
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_LireVersion)(void FARPTR FARPTR ZDonneesSortie, size_t FARPTR TailleDonneesSortie);
|
||||
|
||||
/* Fonction simplifiée */
|
||||
#ifdef SGD
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_LireVersion_S)(unsigned short NumeroSession);
|
||||
#endif
|
||||
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_InitTrace
|
||||
%
|
||||
% Rôle : Initialisation des traces du module STS-Interface dans un fichier log.
|
||||
% Cette fonction permet d'activer ou désactiver (niveau 0) les
|
||||
% traces. Une activation requiert un nom de fichier et un mode
|
||||
% d'ouverture. Un changement de niveau peut se faire sur le même
|
||||
% fichier ou sur un différent s'il est précisé en entrée
|
||||
%
|
||||
% Paramètres d'entrée :
|
||||
% NomFichier (char*) : Chemin et nom de fichier de trace
|
||||
% ModeOuverture (char*) : Mode d'ouverture du fichier de trace
|
||||
% "a", "w" (,"ab", "wb").
|
||||
% Module (ushort) : n° de module 0 à 5 (6=TOUS)
|
||||
% Niveau (uchar) : Niveau de trace : 0 signifie pas de trace, 1
|
||||
% signifie traces de profondeur 8 et >=2 signifie traces sans limite
|
||||
% de profondeur et activation traces module STS_SI
|
||||
%
|
||||
% Paramètres de sortie : aucun
|
||||
%
|
||||
% Valeur retournée :
|
||||
% OK si pas d'erreur
|
||||
% ERR_PARAM si NomFichier/ModeOuverture incorrect quand Niveau > 0
|
||||
% ERR_TRACE_FILE si erreur d'ouverture du fichier de trace
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
/* OCL - Defect 91 : Rectification du prototype de InitTrace() */
|
||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_InitTrace)(const char FARPTR pathConf, const char FARPTR ModeOuverture,
|
||||
unsigned short Module, unsigned char Niveau);
|
||||
|
||||
/*********************************************************************************
|
||||
************************* Fonctions d'initialisation et de terminaison *********
|
||||
*********************************************************************************/
|
||||
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_InitLIB
|
||||
%
|
||||
% Rôle : Initialisation du module STS-Interface : Chargement des tables externes
|
||||
% et suivi de parc. Appel de l'nitialisation de chaque module STS
|
||||
%
|
||||
% Paramètres d'entrée : aucun
|
||||
%
|
||||
% Paramètres de sortie : aucun
|
||||
%
|
||||
% Valeur retournée :
|
||||
% OK si pas d'erreur
|
||||
% ERR_INTERNE_ITF si erreur interne du module STS-Interface (ou STS SI)
|
||||
% ERR_MEM_DISPO si plus de mémoire disponible
|
||||
% ERR_PKG_PATH_INI si le chemin d'accès au fichier binaire est
|
||||
% inconnu (fichier de configuration inaccessible ou information
|
||||
% manquante)
|
||||
% ERR_ITF_PKG_ACCES si fichier binaire de table inaccessible
|
||||
% ERR_ITF_PKG_VER si version du fichier incohérent avec version du
|
||||
% module STS-Interface (dans les deux sens)
|
||||
% ERR_ITF_PKG_CRC si CRC du fichier binaire est incorrect
|
||||
% ERR_ITF_PKG_FORME si format du fichier incorrect
|
||||
% ERR_ITF_PKG_INCPT s'il manque une table dans le fichier binaire
|
||||
% ERR_ITF_PKG_NOM si le nom du fichier est différent du nom dans
|
||||
% l'en-tête du fichier.
|
||||
% les codes suivants ne sont pas des erreurs fatales (non bloquant)
|
||||
% mais juste des avertissements
|
||||
% WAR_STS_DEJA_INITIALISE si module déjà initialisé
|
||||
% WAR_ADM_PATH si chemin au suivi de parc non trouvé dans fichier
|
||||
% de configuration des produits SV
|
||||
% WAR_ADM_FILE si impossible de créer les fichiers de suivi de
|
||||
% parc
|
||||
% ET les codes de retour de chaque module STS appelé
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
/* extern unsigned short API_ENTRY STS_InitLIB(); */
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_InitLIB2
|
||||
%
|
||||
% Rôle : Initialisation du module STS-Interface : Chargement des tables externes
|
||||
% et suivi de parc. Appel de l'nitialisation de chaque module STS
|
||||
%
|
||||
% Paramètres d'entrée :
|
||||
% NomFichierIni (char*) : Chemin et nom du fichier de configuration des
|
||||
% produits SESAM Vitale du poste de travail (sesam.ini)
|
||||
%
|
||||
% Paramètres de sortie : aucun
|
||||
%
|
||||
% Valeur retournée :
|
||||
% OK si pas d'erreur
|
||||
% ERR_INTERNE_ITF si erreur interne du module STS-Interface (ou STS SI)
|
||||
% ERR_MEM_DISPO si plus de mémoire disponible
|
||||
% ERR_PKG_PATH_INI si le chemin d'accès au fichier binaire est
|
||||
% inconnu (fichier de configuration inaccessible ou information
|
||||
% manquante)
|
||||
% ERR_ITF_PKG_ACCES si fichier binaire de table inaccessible
|
||||
% ERR_ITF_PKG_VER si version du fichier incohérent avec version du
|
||||
% module STS-Interface (dans les deux sens)
|
||||
% ERR_ITF_PKG_CRC si CRC du fichier binaire est incorrect
|
||||
% ERR_ITF_PKG_FORME si format du fichier incorrect
|
||||
% ERR_ITF_PKG_INCPT s'il manque une table dans le fichier binaire
|
||||
% ERR_ITF_PKG_NOM si le nom du fichier est différent du nom dans
|
||||
% l'en-tête du fichier.
|
||||
% les codes suivants ne sont pas des erreurs fatales (non bloquant)
|
||||
% mais juste des avertissements
|
||||
% WAR_STS_DEJA_INITIALISE si module déjà initialisé
|
||||
% WAR_ADM_PATH si chemin au suivi de parc non trouvé dans fichier
|
||||
% de configuration des produits SV
|
||||
% WAR_ADM_FILE si impossible de créer les fichiers de suivi de
|
||||
% parc
|
||||
% ET les codes de retour de chaque module STS appelé
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_InitLIB2)(const char FARPTR nomFichierIni);
|
||||
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_TermLIB
|
||||
%
|
||||
% Rôle : Terminaison du module STS-Interface : Déchargement des tables externes.
|
||||
%
|
||||
% Paramètres d'entrée : aucun
|
||||
%
|
||||
% Paramètres de sortie : aucun
|
||||
%
|
||||
% Valeur retournée :
|
||||
% OK si pas d'erreur
|
||||
% ERR_INTERNE_ITF si erreur interne du module STS-Interface (ou STS SI)
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_TermLIB)(void);
|
||||
|
||||
/*********************************************************************************
|
||||
************************* Fonctions de gestion de la mémoire *******************
|
||||
*********************************************************************************/
|
||||
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_AllouerZoneMem
|
||||
%
|
||||
% Rôle : Allocation d'une zone d'échange de sortie par STS Interface.
|
||||
% Cette fonction permet la réallocation d'une zone d'échange.
|
||||
% L'allocation d'une nouvelle zone d'échange nécessite un pointeur
|
||||
% NULL en entrée !
|
||||
% Cette fonctio est à utiliser conjointement avec STS_LibererZoneMem
|
||||
% pour faciliter le Debugage (zone allouée par l'écrivain)
|
||||
%
|
||||
% Paramètres d'entrée :
|
||||
% Taille (size_t) : Taille de la zone d'échange à allouer.
|
||||
%
|
||||
% Paramètres d'entrée et de sortie :
|
||||
% Zone (void**) : Zone d'échange préallouée en entrée (ou NULL).
|
||||
% Zone allouée (réallouée) par le module STS-Interface.
|
||||
%
|
||||
% Valeur retournée :
|
||||
% OK si pas d'erreur
|
||||
% ERR_ZOUT si Zone==NULL ou Taille==0
|
||||
% ERR_ZONE_ALLOC si plus de mémoire disponible
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
||||
typedef unsigned short (API_ENTRY FARPTR STS_AllouerZoneMem)(void FARPTR FARPTR Zone, size_t Taille);
|
||||
|
||||
|
||||
/*
|
||||
%-----------------------------------------------------------------------------
|
||||
% STS_LibererZoneMem
|
||||
%
|
||||
% Rôle : Libération de la zone d'échange de sortie par STS Interface.
|
||||
%
|
||||
% Paramètres d'entrée :
|
||||
% Zone (void*) : Zone d'échange à libérer (allouée précédemment par
|
||||
% le module STS-Interce par STS_AllouerZoneMem).
|
||||
%
|
||||
% Paramètres de sortie : aucun
|
||||
%
|
||||
% Valeur retournée : aucune
|
||||
%
|
||||
%-----------------------------------------------------------------------------
|
||||
*/
|
||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
||||
typedef void (API_ENTRY FARPTR STS_LibererZoneMem)(void FARPTR Zone);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __STSITF_H */
|
@ -1,189 +0,0 @@
|
||||
/*---------------------------------------------------------------------------
|
||||
PROJET : Couche de portabilite multi-systeme
|
||||
|
||||
PLATE-FORME: LINUX
|
||||
|
||||
MODULE : Definition des macros et des types utilises par la couche
|
||||
d'abstraction systeme pour la plate-forme LINUX.
|
||||
|
||||
Le fichier de definition des types portable (ce fichier) doit
|
||||
etre inclus avant tout autre .h de definitions d'APIS gip-cps.
|
||||
Ce fichier definit tous les types et macros dependants du
|
||||
systeme.
|
||||
|
||||
FICHIER : common\linux\src\linuxdef.h
|
||||
|
||||
VERSION : 1.00
|
||||
|
||||
DATE : 10/01/2001
|
||||
|
||||
AUTEUR : ALVARO ROCHA
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
-----------------------------------------------------------------------------
|
||||
Modifications: (nouvelle version, date, auteur, explication)
|
||||
...
|
||||
|
||||
- V4.31 - AROC le 12/02/2001 :
|
||||
Ajout des #define TRUE et FALSE ainsi que le typedef int BOOLEEN
|
||||
-----------------------------------------------------------------------------
|
||||
---------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
#ifndef __CPSCASDF_H
|
||||
#define __CPSCASDF_H
|
||||
|
||||
/*----------------- definition des macros portables ------------------------*/
|
||||
#ifndef far
|
||||
#define far
|
||||
#endif
|
||||
|
||||
#ifndef FAR
|
||||
#define FAR
|
||||
#endif
|
||||
|
||||
#ifndef PTR
|
||||
#define PTR *
|
||||
#endif
|
||||
|
||||
#ifndef PVOID
|
||||
#define PVOID void PTR
|
||||
#endif
|
||||
|
||||
#ifndef FARPTR
|
||||
#define FARPTR PTR
|
||||
#endif
|
||||
|
||||
#ifndef FPVOID
|
||||
#define FPVOID void FARPTR
|
||||
#endif
|
||||
|
||||
/* AROC 12/02/2001 debut : */
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
/* AROC 12/02/2001 fin */
|
||||
|
||||
/*----------------- definition des types portables ------------------------*/
|
||||
#ifndef CHAR
|
||||
#define CHAR char
|
||||
#endif
|
||||
|
||||
#ifndef PCHAR
|
||||
#define PCHAR CHAR PTR
|
||||
#endif
|
||||
|
||||
#ifndef PSTRG
|
||||
#define PSTRG CHAR PTR
|
||||
#endif
|
||||
|
||||
#ifndef UCHAR
|
||||
#define UCHAR unsigned char
|
||||
#endif
|
||||
|
||||
#ifndef PUCHAR
|
||||
#define PUCHAR UCHAR PTR
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef INT8
|
||||
#define INT8 char
|
||||
#endif
|
||||
|
||||
#ifndef INT16
|
||||
#define INT16 short
|
||||
#endif
|
||||
|
||||
#ifndef INT32
|
||||
#define INT32 long
|
||||
#endif
|
||||
|
||||
#ifndef PINT8
|
||||
#define PINT8 INT8 PTR
|
||||
#endif
|
||||
|
||||
#ifndef PINT16
|
||||
#define PINT16 INT16 PTR
|
||||
#endif
|
||||
|
||||
#ifndef PINT32
|
||||
#define PINT32 INT32 PTR
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef UINT8
|
||||
#define UINT8 unsigned char
|
||||
#endif
|
||||
|
||||
#ifndef UINT16
|
||||
#define UINT16 unsigned short
|
||||
#endif
|
||||
|
||||
#ifndef UINT32
|
||||
#define UINT32 unsigned long
|
||||
#endif
|
||||
|
||||
#ifndef PUINT8
|
||||
#define PUINT8 UINT8 PTR
|
||||
#endif
|
||||
|
||||
#ifndef PUINT16
|
||||
#define PUINT16 UINT16 PTR
|
||||
#endif
|
||||
|
||||
#ifndef PUINT32
|
||||
#define PUINT32 UINT32 PTR
|
||||
#endif
|
||||
|
||||
|
||||
/* 11/02/1997 : Ajout DRE pour CPSCAS */
|
||||
#ifndef VOID
|
||||
#define VOID void
|
||||
#endif
|
||||
#ifndef PSTR
|
||||
#define PSTR char PTR
|
||||
#endif
|
||||
/* 11/02/1997 : Fin */
|
||||
|
||||
#ifndef WORD
|
||||
#define WORD unsigned short
|
||||
#endif
|
||||
|
||||
#ifndef DWORD
|
||||
#define DWORD unsigned long
|
||||
#endif
|
||||
//typedef unsigned char BYTE;
|
||||
#ifndef BYTE
|
||||
#define BYTE unsigned char
|
||||
#endif
|
||||
//typedef BYTE far * LPBYTE;
|
||||
#ifndef LPBYTE
|
||||
#define LPBYTE BYTE far *
|
||||
#endif
|
||||
//typedef int BOOL;
|
||||
#ifndef BOOL
|
||||
#define BOOL int
|
||||
#endif
|
||||
|
||||
#ifndef Unref
|
||||
#define Unref( a) a=a
|
||||
#endif
|
||||
|
||||
#ifndef min
|
||||
#define min(a,b) ((a)>(b)?(b):(a))
|
||||
#endif
|
||||
|
||||
#ifndef max
|
||||
#define max(a,b) ((a)<(b)?(b):(a))
|
||||
#endif
|
||||
|
||||
/* Taille maximale allouée par la fonction "malloc" */
|
||||
#ifndef MAXBLOC
|
||||
#define MAXBLOC 4294967295
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,85 +0,0 @@
|
||||
/*
|
||||
* -------------------------------------------------------------------
|
||||
* (c) 2002 GIE SESAM-VITALE
|
||||
*
|
||||
* FICHIER : sys_def.h (v2)
|
||||
*
|
||||
* PLATE-FORME : Windows 32 bits
|
||||
*
|
||||
* Définitions dépendantes du système.
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include "linuxdef.h"
|
||||
#include "stdlib.h"
|
||||
|
||||
#ifndef __SYS_DEF_H__
|
||||
#define __SYS_DEF_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef API_ENTRY
|
||||
#define API_ENTRY
|
||||
#endif
|
||||
|
||||
#ifndef _MAX_PATH
|
||||
#define _MAX_PATH 256
|
||||
#endif
|
||||
|
||||
#ifndef _MAX_FNAME
|
||||
#define _MAX_FNAME 160
|
||||
#endif
|
||||
|
||||
#ifndef _MAX_DIR
|
||||
#define _MAX_DIR 800
|
||||
#endif
|
||||
|
||||
#ifndef FARPTR
|
||||
#define FARPTR *
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_PATH
|
||||
#define SYS_MAX_PATH _MAX_PATH
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_FNAME
|
||||
#define SYS_MAX_FNAME _MAX_FNAME
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_DIR
|
||||
#define SYS_MAX_DIR _MAX_DIR
|
||||
#endif
|
||||
|
||||
#ifndef SYS_HANDLE
|
||||
#define SYS_HANDLE void *
|
||||
#endif
|
||||
|
||||
#ifndef PTR
|
||||
#define PTR *
|
||||
#endif
|
||||
|
||||
#ifndef SYSFARPROC_
|
||||
#define SYSFARPROC_
|
||||
typedef unsigned short (API_ENTRY FARPTR SYSFARPROC)();
|
||||
#endif
|
||||
|
||||
|
||||
/* Séparateur utilisé dans le nommage des arborescences de fichiers */
|
||||
#ifndef SEPARATEUR_REPERTOIRE
|
||||
#define SEPARATEUR_REPERTOIRE '/'
|
||||
#endif
|
||||
|
||||
|
||||
/* Activation des fonctions simplifiées. */
|
||||
#ifndef SGD
|
||||
#define SGD
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,92 +0,0 @@
|
||||
/*
|
||||
* -------------------------------------------------------------------
|
||||
* (c) 2002 GIE SESAM-VITALE
|
||||
*
|
||||
* FICHIER : sys_def.h (v2)
|
||||
*
|
||||
* PLATE-FORME : MAC OSX
|
||||
*
|
||||
* Définitions dépendantes du système.
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
//3/11/2004 Modification pour compilation MAC OS X
|
||||
#include "osxdef.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <errno.h>
|
||||
#include "stdlib.h"
|
||||
|
||||
#ifndef __SYS_DEF_H__
|
||||
#define __SYS_DEF_H__
|
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
//3-11-2004 Ajout pour MAc OS X
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
|
||||
//3/11/2004 Modification pour compilation MAC OS X
|
||||
#ifndef API_ENTRY
|
||||
#define API_ENTRY
|
||||
#endif
|
||||
|
||||
#ifndef FARPTR
|
||||
#define FARPTR *
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_PATH
|
||||
#define SYS_MAX_PATH _MAX_PATH
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_FNAME
|
||||
#define SYS_MAX_FNAME _MAX_FNAME
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_DIR
|
||||
#define SYS_MAX_DIR _MAX_DIR
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef PTR
|
||||
#define PTR *
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef SYS_HANDLE
|
||||
//typedef void * SYS_HANDLE;
|
||||
#define SYS_HANDLE void *
|
||||
#endif
|
||||
|
||||
#ifndef SYSFARPROC_
|
||||
#define SYSFARPROC_
|
||||
typedef unsigned short (API_ENTRY FARPTR SYSFARPROC)();
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/* Séparateur utilisé dans le nommage des arborescences de fichiers */
|
||||
#ifndef SEPARATEUR_REPERTOIRE
|
||||
#ifdef WIN32
|
||||
#define SEPARATEUR_REPERTOIRE '\\'
|
||||
#else
|
||||
#define SEPARATEUR_REPERTOIRE '/'
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
/* Activation des fonctions simplifiées. */
|
||||
#ifndef SGD
|
||||
#define SGD
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,150 +0,0 @@
|
||||
/*---------------------------------------------------------------------------
|
||||
PROJET : Couche de portabilite multi-systeme
|
||||
|
||||
PLATE-FORME: MAC OS X
|
||||
|
||||
MODULE : Definition des macros et des types utilises par la couche
|
||||
d'abstraction systeme pour la plate-forme LINUX.
|
||||
|
||||
Le fichier de definition des types portable (ce fichier) doit
|
||||
etre inclus avant tout autre .h de definitions d'APIS gip-cps.
|
||||
Ce fichier definit tous les types et macros dependants du
|
||||
systeme.
|
||||
|
||||
FICHIER : common\linux\src\linuxdef.h
|
||||
|
||||
VERSION : 1.00
|
||||
|
||||
DATE : 10/01/2001
|
||||
|
||||
AUTEUR : ALVARO ROCHA
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
-----------------------------------------------------------------------------
|
||||
Modifications: (nouvelle version, date, auteur, explication)
|
||||
...
|
||||
|
||||
- V4.31 - AROC le 12/02/2001 :
|
||||
Ajout des #define TRUE et FALSE ainsi que le typedef int BOOLEEN
|
||||
-----------------------------------------------------------------------------
|
||||
---------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
#ifndef __CPSCASDF_H
|
||||
#define __CPSCASDF_H
|
||||
|
||||
//#ifndef __MACTYPES__
|
||||
/*#include <CarbonCore/MacTypes.h>*/
|
||||
//#include"/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacTypes.h"*/
|
||||
//#endif
|
||||
|
||||
|
||||
|
||||
/*----------------- definition des macros portables ------------------------*/
|
||||
|
||||
|
||||
/* point d'entree exporte en DLL ????????????????????????????????????????? */
|
||||
#define API_ENTRY /* pour l'instant */
|
||||
|
||||
#define far
|
||||
#define FAR
|
||||
|
||||
#define PTR *
|
||||
|
||||
#define PVOID void PTR
|
||||
|
||||
#ifndef FARPTR
|
||||
#define FARPTR PTR
|
||||
#endif
|
||||
#define FPVOID void FARPTR
|
||||
|
||||
/* AROC 18/O4/2001 ajout pour io_comm*/
|
||||
#define HCOMM unsigned int
|
||||
#define PHCOMM HCOMM FARPTR
|
||||
|
||||
/* AROC 12/02/2001 debut : */
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
/* AROC 12/02/2001 fin */
|
||||
|
||||
/*----------------- definition des types portables ------------------------*/
|
||||
|
||||
/* AROC 12/02/2001 debut : */
|
||||
/* mise en commentaire de ce define car pb avec module sts où BOOLEEN est defini en char*/
|
||||
//#ifndef BOOLEEN
|
||||
//typedef int BOOLEEN;
|
||||
//#define BOOLEEN int
|
||||
//#endif
|
||||
/* AROC 12/02/2001 fin */
|
||||
/* Boolean */
|
||||
#define BOOL Boolean
|
||||
|
||||
//#define _MAX_PATH 1024
|
||||
typedef char CHAR;
|
||||
typedef CHAR PTR PCHAR;
|
||||
|
||||
typedef CHAR PTR PSTRG;
|
||||
|
||||
typedef unsigned char UCHAR;
|
||||
typedef UCHAR PTR PUCHAR;
|
||||
|
||||
typedef char INT8;
|
||||
typedef short INT16;
|
||||
typedef long INT32;
|
||||
|
||||
typedef INT8 PTR PINT8;
|
||||
typedef INT16 PTR PINT16;
|
||||
typedef INT32 PTR PINT32;
|
||||
|
||||
typedef unsigned char UINT8;
|
||||
typedef unsigned short UINT16;
|
||||
typedef unsigned long UINT32;
|
||||
|
||||
typedef UINT8 PTR PUINT8;
|
||||
typedef UINT16 PTR PUINT16;
|
||||
typedef UINT32 PTR PUINT32;
|
||||
|
||||
/* 11/02/1997 : Ajout DRE pour CPSCAS */
|
||||
typedef void VOID;
|
||||
typedef char PTR PSTR;
|
||||
/* 11/02/1997 : Fin */
|
||||
|
||||
typedef unsigned short WORD;
|
||||
typedef unsigned long DWORD;
|
||||
typedef unsigned char BYTE;
|
||||
typedef BYTE far * LPBYTE;
|
||||
|
||||
#define Unref( a) a=a
|
||||
|
||||
#ifndef min
|
||||
#define min(a,b) ((a)>(b)?(b):(a))
|
||||
#endif
|
||||
|
||||
#ifndef max
|
||||
#define max(a,b) ((a)<(b)?(b):(a))
|
||||
#endif
|
||||
|
||||
#ifdef LITTLE_ENDIAN
|
||||
#undef LITTLE_ENDIAN
|
||||
#endif
|
||||
|
||||
#ifndef PATH_MAX
|
||||
#define PATH_MAX 1024
|
||||
#endif
|
||||
#ifndef _MAX_PATH
|
||||
#define _MAX_PATH PATH_MAX /* PATH_MAX defini dans <usr/include/sys/syslimits.h> */
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/* Taille maximale allouÈe par la fonction "malloc" */
|
||||
#ifndef MAXBLOC
|
||||
#define MAXBLOC 0x7FFFFFFF
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,69 +0,0 @@
|
||||
/*
|
||||
* -------------------------------------------------------------------
|
||||
* (c) 2002 GIE SESAM-VITALE
|
||||
*
|
||||
* FICHIER : sys_def.h (v2)
|
||||
*
|
||||
* PLATE-FORME : Windows 32 bits
|
||||
*
|
||||
* Définitions dépendantes du système.
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifndef __SYS_DEF_H__
|
||||
#define __SYS_DEF_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef API_ENTRY
|
||||
#define API_ENTRY __stdcall
|
||||
#endif
|
||||
|
||||
#ifndef FARPTR
|
||||
#define FARPTR *
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_PATH
|
||||
#define SYS_MAX_PATH _MAX_PATH
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_FNAME
|
||||
#define SYS_MAX_FNAME _MAX_FNAME
|
||||
#endif
|
||||
|
||||
#ifndef SYS_MAX_DIR
|
||||
#define SYS_MAX_DIR _MAX_DIR
|
||||
#endif
|
||||
|
||||
typedef void * SYS_HANDLE;
|
||||
|
||||
#ifndef PTR
|
||||
#define PTR *
|
||||
#endif
|
||||
|
||||
|
||||
typedef unsigned short (API_ENTRY FARPTR SYSFARPROC)();
|
||||
|
||||
|
||||
|
||||
/* Séparateur utilisé dans le nommage des arborescences de fichiers */
|
||||
#ifndef SEPARATEUR_REPERTOIRE
|
||||
#define SEPARATEUR_REPERTOIRE '\\'
|
||||
#endif
|
||||
|
||||
|
||||
/* Activation des fonctions simplifiées. */
|
||||
#ifndef SGD
|
||||
#define SGD
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,13 +0,0 @@
|
||||
[package]
|
||||
name = "fsv"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.89"
|
||||
libc = "0.2.159"
|
||||
num_enum = { version = "0.7.3", features = ["complex-expressions"] }
|
||||
thiserror = "1.0.64"
|
||||
|
||||
fsv-sys = { path = "../fsv-sys" }
|
||||
utils = { path = "../utils" }
|
@ -1 +0,0 @@
|
||||
mod ssv;
|
@ -1,183 +0,0 @@
|
||||
use num_enum::FromPrimitive;
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Error, Debug, Eq, PartialEq, FromPrimitive)]
|
||||
#[repr(u16)]
|
||||
/// Liste des codes d'erreur retournés par la librairie C SSV
|
||||
/// Documentation: Manuel de programmation SSV - Annexe A (p. 215)
|
||||
pub enum SSVErrorCodes {
|
||||
#[error("La Carte du Professionnel de Santé est absente du lecteur.")]
|
||||
CPSMissing = 0xF001,
|
||||
#[error("La Carte du Professionnel de Santé bloquée après trois codes porteur erronés.")]
|
||||
CPSBlocked = 0xF002,
|
||||
#[error("Le code porteur présenté est erroné.")]
|
||||
CPSPinWrong = 0xF003,
|
||||
#[error("Carte du Professionnel de Santé non valide ou inexploitable par le Logiciel Lecteur. Vérifier la présence d'un Domaine d'Assurance Maladie (DAM).")]
|
||||
CPSInvalid = 0xF004,
|
||||
#[error("La Carte du Professionnel de Santé est retirée du lecteur.")]
|
||||
CPSRemoved = 0xF005,
|
||||
/// - Sécurisation d'une série de lots en cours.
|
||||
/// - Pour les fonctions TLA (sauf Identifier TLA) : Cette erreur survient lorsque le simulateur TLA est en mode 1.50.
|
||||
/// - Lire Date Lecteur, Mettre à jour Date Lecteur, Lire Droits Vitale : Cette erreur peut survenir lorsque le Logiciel Lecteur ne connaît pas la fonction sollicitée, c'est-à-dire si la version du Logiciel Lecteur est antérieure à 2.00.
|
||||
/// - Décharger Données Bénéficiaires : cette erreur peut survenir pour signaler que le format des données issues du lecteur est incompatible avec cette version de SSV.
|
||||
#[error("F022: Erreur commune à plusieurs fonctions.")]
|
||||
F022 = 0xF022,
|
||||
#[error("Message du lecteur incohérent. Débrancher et rebrancher le lecteur.")]
|
||||
PCSCInconsistentMessage = 0xF0FF,
|
||||
#[error("Le nom de lecteur fourni ne correspond à aucun lecteur reconnu.")]
|
||||
PCSCReaderNotFound = 0xF101,
|
||||
#[error("La fonction InitLIB2 n'est pas encore appelée ou la fonction TermLIB a déjà été appelée.")]
|
||||
FunctionInitLib2NotCalled = 0xF600,
|
||||
#[error("La bibliothèque SSV n’est pas chargée en mémoire. Vérifier que la fonction InitLIB2 a bien été appelée.")]
|
||||
LibraryNotLoaded = 0xF690, // Warning
|
||||
#[error("Carte vitale en opposition.")]
|
||||
VitaleOpposition = 0xF6A1,
|
||||
#[error("Zone de mémoire non allouée en sortie.")]
|
||||
MemoryNotAllocated = 0xF800,
|
||||
#[error("Erreur d'allocation de la zone de mémoire en sortie.")]
|
||||
MemoryAllocationError = 0xF801,
|
||||
#[error("Un des paramètres obligatoires d'entrée est non alloué ou invalide.")]
|
||||
InputParameterNotAllocatedOrInvalid = 0xF802,
|
||||
#[error("Zone de mémoire spécifiée en entrée non valide. Vérifier que la zone allouée ne dépasse pas la taille maximale autorisée (MAXBLOC).")]
|
||||
InputMemoryInvalid = 0xF803,
|
||||
#[error("Le format de la zone de mémoire d'entrée ou le nombre de zones mémoire est incorrect.")]
|
||||
InputMemoryFormatIncorrect = 0xF810,
|
||||
#[error("Problème lors de l’initialisation du protocole. Erreur du Ressource Manager PC/SC. Vérifiez le lecteur.")]
|
||||
PCSCProtocolInitError = 0xFF01,
|
||||
#[error("Time-out au niveau protocolaire ou transmission déjà en cours avec le lecteur. Vérifiez le lecteur et l'insertion de la carte.")]
|
||||
PCSCProtocolTimeout = 0xFF02,
|
||||
#[error("Taille insuffisante allouée en entrée d’une fonction du Resource Manager.")]
|
||||
PCSCProtocolInputMemoryTooSmall = 0xFF03,
|
||||
#[error("Erreur de transmission du protocole. Vérifiez le lecteur et l'insertion de la carte.")]
|
||||
PCSCProtocolTransmissionError = 0xFF04,
|
||||
#[error("Lecteur absent ou indisponible.")]
|
||||
PCSCReaderMissingOrUnavailable = 0xFF05,
|
||||
#[error("Le nom du lecteur transmis est inconnu du Resource Manager PC/SC.")]
|
||||
PCSCReaderUnknown = 0xFF06,
|
||||
#[error("Erreur inconnue remontée par le Resource Manager PC/SC.")]
|
||||
PCSCUnknownError = 0xFF07,
|
||||
#[error("Erreur interne Resource Manager PC/SC.")]
|
||||
PCSCInternalError = 0xFF08,
|
||||
#[error("Ressource PC/SC déjà prise en exclusivité. Vérifiez qu'une autre application n'utilise pas le lecteur.")]
|
||||
PCSCResourceAlreadyExclusive = 0xFF09,
|
||||
#[error("Protocole incompatible avec la carte à puce. Vérifiez l'insertion de la carte et son état.")]
|
||||
PCSCProtocolIncompatible = 0xFF0A,
|
||||
#[error("Paramètre incorrect. Erreur interne à la librairie SSV.")]
|
||||
PCSCIncorrectParameter = 0xFF0B,
|
||||
#[error("Carte absente. Insérez une carte dans le lecteur.")]
|
||||
PCSCCardMissing = 0xFF0C,
|
||||
#[error("L'état de la carte a été modifié (RAZ ou mise hors tension). Vérifiez si la carte n'a pas été retirée ou si une autre application n'utilise pas la carte.")]
|
||||
PCSCCardStateChanged = 0xFF0D,
|
||||
#[error("Carte muette ou non supportée. Vérifiez l'insertion de la carte.")]
|
||||
PCSCCardUnsupported = 0xFF0E,
|
||||
#[error("Code porteur CPS non renseigné.")]
|
||||
CPSPinMissing = 0xFF21,
|
||||
#[error("Ressource PC/SC déjà prise en exclusivité. Vérifiez que le processus en cours n'utilise pas déjà le lecteur.")]
|
||||
PCSCReaderAlreadyExclusiveForCurrentProcess = 0xFF24,
|
||||
#[error("Plusieurs lecteurs ou cartes de même type identifiés lors de la détection automatique.")]
|
||||
PCSCDuplicatedReadersOrCardsDetected = 0xFF29,
|
||||
#[error("Problème de chargement de la librairie cryptographique ou erreur retournée par la librairie cryptographique.")]
|
||||
CryptoLibraryError = 0xFF30,
|
||||
#[error("Erreurs internes aux Services SESAM-Vitale. Vérifiez les traces.")]
|
||||
#[num_enum(alternatives = [0xFFF1..=0xFFFF])]
|
||||
SSVInternalError = 0xFFF0,
|
||||
#[error("Le fichier `tablebin.smc` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
||||
FileMissingTablebinMsc = 0xF610, // tablebin.smc
|
||||
#[error("Le fichier `scripts.sms` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
||||
FileMissingScriptsSms = 0xF611, // scripts.sms
|
||||
#[error("Le fichier `tablebin.ssv` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
||||
FileMissingTablebinSsv = 0xF612, // tablebin.ssv
|
||||
#[error("Le fichier `script.ssv` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
||||
FileMissingScriptSsv = 0xF613, // script.ssv
|
||||
#[error("La version du fichier `tablebin.smc` est incompatible avec la bibliothèque des SSV.")]
|
||||
FileVersionIncompatibleTablebinMsc = 0xF620, // tablebin.smc
|
||||
#[error("La version du fichier `scripts.sms` est incompatible avec la bibliothèque des SSV.")]
|
||||
FileVersionIncompatibleScriptsSms = 0xF621, // scripts.sms
|
||||
#[error("La version du fichier `tablebin.ssv` est incompatible avec la bibliothèque des SSV.")]
|
||||
FileVersionIncompatibleTablebinSsv = 0xF622, // tablebin.ssv
|
||||
#[error("La version du fichier `script.ssv` est incompatible avec la bibliothèque des SSV.")]
|
||||
FileVersionIncompatibleScriptSsv = 0xF623, // script.ssv
|
||||
#[error("L'intégrité du fichier `tablebin.smc` est incorrecte.")]
|
||||
FileIntegrityIncorrectTablebinMsc = 0xF630, // tablebin.smc
|
||||
#[error("L'intégrité du fichier `scripts.sms` est incorrecte.")]
|
||||
FileIntegrityIncorrectScriptsSms = 0xF631, // scripts.sms
|
||||
#[error("L'intégrité du fichier `tablebin.ssv` est incorrecte.")]
|
||||
FileIntegrityIncorrectTablebinSsv = 0xF632, // tablebin.ssv
|
||||
#[error("L'intégrité du fichier `script.ssv` est incorrecte.")]
|
||||
FileIntegrityIncorrectScriptSsv = 0xF633, // script.ssv
|
||||
#[error("La structure interne du fichier `tablebin.smc` est invalide.")]
|
||||
FileStructureInvalidTablebinMsc = 0xF640, // tablebin.smc
|
||||
#[error("La structure interne du fichier `scripts.sms` est invalide.")]
|
||||
FileStructureInvalidScriptsSms = 0xF641, // scripts.sms
|
||||
#[error("La structure interne du fichier `tablebin.ssv` est invalide.")]
|
||||
FileStructureInvalidTablebinSsv = 0xF642, // tablebin.ssv
|
||||
#[error("La structure interne du fichier `script.ssv` est invalide.")]
|
||||
FileStructureInvalidScriptSsv = 0xF643, // script.ssv
|
||||
#[error("Le fichier `tablebin.smc` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
||||
FileLoadFailedTablebinMsc = 0xF650, // tablebin.smc
|
||||
#[error("Le fichier `scripts.sms` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
||||
FileLoadFailedScriptsSms = 0xF651, // scripts.sms
|
||||
#[error("Le fichier `tablebin.ssv` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
||||
FileLoadFailedTablebinSsv = 0xF652, // tablebin.ssv
|
||||
#[error("Le fichier `script.ssv` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
||||
FileLoadFailedScriptSsv = 0xF653, // script.ssv
|
||||
#[error("Le nom du fichier `tablebin.smc` est invalide.")]
|
||||
FileNameInvalidTablebinMsc = 0xF660, // tablebin.smc
|
||||
#[error("Le nom du fichier `scripts.sms` est invalide.")]
|
||||
FileNameInvalidScriptsSms = 0xF661, // scripts.sms
|
||||
#[error("Le nom du fichier `tablebin.ssv` est invalide.")]
|
||||
FileNameInvalidTablebinSsv = 0xF662, // tablebin.ssv
|
||||
#[error("Le nom du fichier `script.ssv` est invalide.")]
|
||||
FileNameInvalidScriptSsv = 0xF663, // script.ssv
|
||||
#[error("La fonction Initialiser Librairie est déjà appelée.")]
|
||||
FunctionInitLib2AlreadyCalled = 0xF670, // Warning
|
||||
#[error("Le fichier SESAM.INI est inaccessible en lecture (fichier ou droit d’accès manquant) ou ne contient pas le chemin des tables binaires des SSV.")]
|
||||
SesamIniMissingFileOrTablebinPath = 0xF680,
|
||||
#[error("Le chemin du répertoire de travail est absent du fichier SESAM.INI.")]
|
||||
SesamIniMissingWorkDir = 0xF6F1,
|
||||
#[error("Les fichiers d’extension adm ne sont pas accessibles en écriture.")]
|
||||
AdmFilesNotWritable = 0xF6F2, // Warning
|
||||
#[error("Aucune version de FSV du socle technique trouvé. Vérifier que la version du fichier script.sms est bonne.")]
|
||||
NoFsvVersionFound = 0xF6F4,
|
||||
#[error("Librairie SGD absente ou incomplète.")]
|
||||
LibraryMissingOrIncompleteSGD = 0xF6F5,
|
||||
#[error("Librairie SMC absente ou incomplète.")]
|
||||
LibraryMissingOrIncompleteSMC = 0xF6F6,
|
||||
#[error("Librairie SJS absente ou incomplète.")]
|
||||
LibraryMissingOrIncompleteSJS = 0xF6F7,
|
||||
#[error("Librairie SMS absente ou incomplète.")]
|
||||
LibraryMissingOrIncompleteSMS = 0xF6F8,
|
||||
#[error("Section MGC absente / clé RepertoireConfigTrace absente / fichier log4crc.xml non trouvé à l’emplacement indiqué par la clé RepertoireConfigTrace du fichier SESAM.INI.")]
|
||||
SesamIniTracingConfigMissing = 0xFF22, // Warning
|
||||
#[error("Interface Full PC/SC : problème de chargement de la librairie cryptographique ou erreur retournée par la librairie cryptographique.")]
|
||||
PCSCInterfaceCryptoLibraryError = 0xFF25,
|
||||
#[error("Valorisation incorrecte des paramètres de gestion de l'accès aux ressources dans le SESAM.INI. Vérifier les valeurs des clés tempoexclusivite, repetitionexclusivite, tempoexclusivitePCSC, repetitionexclusivitePCSC")]
|
||||
SesamIniResourceAccessParamsIncorrect = 0xFF2A,
|
||||
#[num_enum(catch_all)]
|
||||
#[error("Erreur inattendue de la librairie SSV (code d'erreur: {0}).")]
|
||||
Unexpected(u16),
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_code_ranges() {
|
||||
let error_code = 0xFFF1;
|
||||
let error = SSVErrorCodes::from(error_code);
|
||||
assert_eq!(error, SSVErrorCodes::SSVInternalError);
|
||||
|
||||
let error_code = 0xFFF8;
|
||||
let error = SSVErrorCodes::from(error_code);
|
||||
assert_eq!(error, SSVErrorCodes::SSVInternalError);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_catch_all() {
|
||||
let error_code = 0xFBFF; // Not a valid error code
|
||||
let error = SSVErrorCodes::from(error_code);
|
||||
assert_eq!(error, SSVErrorCodes::Unexpected(0xFBFF));
|
||||
}
|
||||
}
|
||||
|
@ -1,208 +0,0 @@
|
||||
use std::{ffi::CString, ptr};
|
||||
|
||||
use thiserror::Error;
|
||||
|
||||
use fsv_sys::{
|
||||
get_library_path,
|
||||
Error as FsvError,
|
||||
SSVLibrary,
|
||||
SSVLibraryCommon,
|
||||
SupportedFsvVersion,
|
||||
V1_40_13,
|
||||
V1_40_14
|
||||
};
|
||||
|
||||
mod errors_ssv;
|
||||
use errors_ssv::SSVErrorCodes;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum Error {
|
||||
#[error(transparent)]
|
||||
FSVSysLibrary(#[from] FsvError),
|
||||
#[error(transparent)]
|
||||
SSVError(#[from] SSVErrorCodes),
|
||||
}
|
||||
|
||||
/// Enum to hold the different versions of the SSV library
|
||||
enum SsvLibraryVersion {
|
||||
V1_40_13(SSVLibrary<V1_40_13>),
|
||||
V1_40_14(SSVLibrary<V1_40_14>),
|
||||
}
|
||||
|
||||
/// Struct to hold the SSV library and access its functions
|
||||
pub struct SSV {
|
||||
library: SsvLibraryVersion,
|
||||
}
|
||||
|
||||
impl SSV {
|
||||
fn new(version: SupportedFsvVersion) -> Result<Self, Error> {
|
||||
let library = match version {
|
||||
SupportedFsvVersion::V1_40_13 => {
|
||||
let lib_path = get_library_path(&version);
|
||||
let library = SSVLibrary::<V1_40_13>::new(&lib_path)?;
|
||||
SsvLibraryVersion::V1_40_13(library)
|
||||
},
|
||||
SupportedFsvVersion::V1_40_14 => {
|
||||
let lib_path = get_library_path(&version);
|
||||
let library = SSVLibrary::<V1_40_14>::new(&lib_path)?;
|
||||
SsvLibraryVersion::V1_40_14(library)
|
||||
},
|
||||
};
|
||||
Ok(Self {
|
||||
library,
|
||||
})
|
||||
}
|
||||
|
||||
/// # Initialize the SSV library
|
||||
/// Implement: SSV_InitLIB2
|
||||
pub fn init_library(&self, sesam_ini_path: &str) -> Result<(), Error> {
|
||||
let sesam_ini_path = CString::new(sesam_ini_path).expect("CString::new failed");
|
||||
let result = match &self.library {
|
||||
SsvLibraryVersion::V1_40_13(library) => {
|
||||
unsafe { library.ssv_init_lib2(sesam_ini_path.as_ptr()) }?
|
||||
},
|
||||
SsvLibraryVersion::V1_40_14(library) => {
|
||||
unsafe { library.ssv_init_lib2(sesam_ini_path.as_ptr()) }?
|
||||
},
|
||||
};
|
||||
if result != 0 {
|
||||
let error = SSVErrorCodes::from(result);
|
||||
return Err(Error::SSVError(error));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// # Read the CPS card
|
||||
/// Implement: SSV_LireCartePS
|
||||
pub fn read_professional_card(&self, pin_code: &str) -> Result<(), Error> {
|
||||
let pcsc_reader_name = "Gemalto PC Twin Reader (645D94C3) 00 00";
|
||||
|
||||
let pin_code = CString::new(pin_code).expect("CString::new failed");
|
||||
let pcsc_reader_name = CString::new(pcsc_reader_name).expect("CString::new failed");
|
||||
let mut out_buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||
let mut out_buffer_size: libc::size_t = 0;
|
||||
|
||||
let result = match &self.library {
|
||||
SsvLibraryVersion::V1_40_13(library) => {
|
||||
unsafe { library.ssv_lire_carte_ps(
|
||||
pcsc_reader_name.as_ptr(),
|
||||
pcsc_reader_name.as_ptr(),
|
||||
pin_code.as_ptr(),
|
||||
&mut out_buffer_ptr,
|
||||
&mut out_buffer_size)
|
||||
}?
|
||||
},
|
||||
SsvLibraryVersion::V1_40_14(library) => {
|
||||
unsafe { library.ssv_lire_carte_ps(
|
||||
pcsc_reader_name.as_ptr(),
|
||||
pcsc_reader_name.as_ptr(),
|
||||
pin_code.as_ptr(),
|
||||
&mut out_buffer_ptr,
|
||||
&mut out_buffer_size)
|
||||
}?
|
||||
},
|
||||
};
|
||||
|
||||
if result != 0 {
|
||||
// Free memory
|
||||
unsafe { libc::free(out_buffer_ptr) };
|
||||
let error = SSVErrorCodes::from(result);
|
||||
return Err(Error::SSVError(error));
|
||||
}
|
||||
// Print 10 bytes of the buffer
|
||||
let buffer = unsafe { std::slice::from_raw_parts(out_buffer_ptr as *const u8, 10) };
|
||||
println!("{:?}", buffer);
|
||||
// Free memory
|
||||
unsafe { libc::free(out_buffer_ptr) };
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// # Get the configuration of the SSV library
|
||||
/// Implement: SSV_LireConfig
|
||||
pub fn get_config(&self) -> Result<(), Error> {
|
||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||
let mut size: libc::size_t = 0;
|
||||
|
||||
let result = match &self.library {
|
||||
SsvLibraryVersion::V1_40_13(library) => {
|
||||
unsafe { library.ssv_lire_config(&mut buffer_ptr, &mut size) }?
|
||||
},
|
||||
SsvLibraryVersion::V1_40_14(library) => {
|
||||
unsafe { library.ssv_lire_config(&mut buffer_ptr, &mut size) }?
|
||||
},
|
||||
};
|
||||
|
||||
if result != 0 {
|
||||
// Free memory
|
||||
unsafe { libc::free(buffer_ptr) };
|
||||
let error = SSVErrorCodes::from(result);
|
||||
return Err(Error::SSVError(error));
|
||||
}
|
||||
// Print 10 bytes of the buffer
|
||||
let buffer = unsafe { std::slice::from_raw_parts(buffer_ptr as *const u8, 10) };
|
||||
println!("{:?}", buffer);
|
||||
// Free memory
|
||||
unsafe { libc::free(buffer_ptr) };
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::env;
|
||||
|
||||
use utils::config::load_config;
|
||||
use anyhow::Result;
|
||||
|
||||
use super::*;
|
||||
|
||||
mod setup {
|
||||
use super::*;
|
||||
|
||||
pub fn init() -> Result<SSV> {
|
||||
load_config().unwrap();
|
||||
let sesam_ini_path = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
|
||||
let lib = SSV::new(SupportedFsvVersion::V1_40_13)?;
|
||||
lib.init_library(&sesam_ini_path)?;
|
||||
Ok(lib)
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_init_library() -> Result<()> {
|
||||
setup::init()?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_read_professional_card_good_pin() -> Result<()> {
|
||||
let lib = setup::init()?;
|
||||
let pin_code = "1234";
|
||||
lib.read_professional_card(pin_code)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[ignore]
|
||||
#[test]
|
||||
fn test_read_professional_card_bad_pin() -> Result<()> {
|
||||
let lib = setup::init()?;
|
||||
let pin_code = "0000";
|
||||
// Should return an error
|
||||
let err = lib.read_professional_card(pin_code).unwrap_err();
|
||||
assert_eq!(err.to_string(), "Le code porteur présenté est erroné.");
|
||||
match err {
|
||||
Error::SSVError(err) => {
|
||||
assert_eq!(err as SSVErrorCodes, SSVErrorCodes::CPSPinWrong);
|
||||
},
|
||||
_ => panic!("Error type is not SSVError"),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_config() -> Result<()> {
|
||||
let lib = setup::init()?;
|
||||
lib.get_config()?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
3
crates/sesam-vitale/.env.build.win
Normal file
3
crates/sesam-vitale/.env.build.win
Normal file
@ -0,0 +1,3 @@
|
||||
SESAM_FSV_VERSION=1.40.14
|
||||
SESAM_FSV_LIB_PATH="C:/Program Files/santesocial/fsv/${SESAM_FSV_VERSION}/lib"
|
||||
SESAM_FSV_SSVLIB=ssvw64
|
@ -1,3 +1,2 @@
|
||||
SESAM_FSV_VERSION=1.40.13
|
||||
SESAM_INI_PATH=/etc/opt/santesocial/fsv/${SESAM_FSV_VERSION}/conf/sesam.ini
|
||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
2
crates/sesam-vitale/.env.win
Normal file
2
crates/sesam-vitale/.env.win
Normal file
@ -0,0 +1,2 @@
|
||||
SESAM_FSV_VERSION=1.40.14
|
||||
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
@ -1,3 +1,2 @@
|
||||
SESAM_FSV_VERSION=1.40.13
|
||||
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
@ -4,11 +4,8 @@ version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow.workspace = true
|
||||
dotenv = "0.15"
|
||||
libc = "0.2"
|
||||
thiserror.workspace = true
|
||||
|
||||
utils = { path = "../utils" }
|
||||
|
||||
[build-dependencies]
|
||||
dotenv.workspace = true
|
||||
dotenv = "0.15"
|
||||
|
@ -1,13 +1,13 @@
|
||||
extern crate dotenv;
|
||||
|
||||
use std::env;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use dotenv::from_path;
|
||||
|
||||
fn main() {
|
||||
// Load the .env.build file for build-time environment variables
|
||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR must be set");
|
||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
||||
let manifest_path = PathBuf::from(manifest_dir);
|
||||
from_path(manifest_path.join(".env.build")).ok();
|
||||
dotenv::from_path(manifest_path.join(".env.build")).ok();
|
||||
|
||||
println!("cargo::rerun-if-env-changed=SESAM_FSV_LIB_PATH");
|
||||
println!("cargo::rerun-if-env-changed=SESAM_FSV_SSVLIB");
|
||||
@ -22,13 +22,12 @@ fn main() {
|
||||
);
|
||||
|
||||
// Add the SESAM_FSV_LIB_PATH to the linker search path
|
||||
let fsv_lib_path =
|
||||
PathBuf::from(env::var("SESAM_FSV_LIB_PATH").expect("SESAM_FSV_LIB_PATH must be set"));
|
||||
let fsv_lib_path = PathBuf::from(env::var("SESAM_FSV_LIB_PATH").unwrap());
|
||||
println!("cargo::rustc-link-search=native={}", fsv_lib_path.display());
|
||||
|
||||
// Add the SESAM_FSV_LIB_PATH to the PATH environment variable
|
||||
if cfg!(target_os = "windows") {
|
||||
let path = env::var("PATH").unwrap_or_default();
|
||||
let path = env::var("PATH").unwrap_or(String::new());
|
||||
println!("cargo:rustc-env=PATH={};{}", fsv_lib_path.display(), path);
|
||||
} else if cfg!(target_os = "linux") {
|
||||
println!("cargo:rustc-env=LD_LIBRARY_PATH={}", fsv_lib_path.display());
|
||||
@ -37,7 +36,7 @@ fn main() {
|
||||
// Link the SESAM_FSV_SSVLIB dynamic library
|
||||
println!(
|
||||
"cargo::rustc-link-lib=dylib={}",
|
||||
env::var("SESAM_FSV_SSVLIB").expect("SESAM_FSV_SSVLIB must be set")
|
||||
env::var("SESAM_FSV_SSVLIB").unwrap()
|
||||
);
|
||||
// TODO : try `raw-dylib` instead of `dylib` on Windows to avoid the need of the `lib` headers compiled from the `def`
|
||||
}
|
||||
|
Binary file not shown.
876
crates/sesam-vitale/src/cartevitale.rs
Normal file
876
crates/sesam-vitale/src/cartevitale.rs
Normal file
@ -0,0 +1,876 @@
|
||||
use libc::{c_void, size_t};
|
||||
use std::ffi::CString;
|
||||
use std::ptr;
|
||||
|
||||
use crate::libssv::SSV_LireDroitsVitale;
|
||||
|
||||
use crate::ssv_memory::{decode_ssv_memory, Block};
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct CarteVitale {
|
||||
donneesAssure: DonneesAssure,
|
||||
serviceAMOFamille: ServiceAMOFamille,
|
||||
donneesAccidentTravail: DonneesAccidentTravail,
|
||||
donneesBeneficiaire: Vec<DonneesBeneficiaire>,
|
||||
}
|
||||
|
||||
// 1. CB = Caractères Binaires »
|
||||
// 2. CE = Caractères « Etendus » (ISO 8859-1)
|
||||
// 3. CA = Caractères Alphanumériques (ASCII?)
|
||||
// 4. CN = Caractères Numériques
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesAssure {
|
||||
type_de_carte_vitale: char, // CA
|
||||
numero_de_serie: String, // CN - 1 -> 20
|
||||
date_de_fin_de_validite: String, // CN - Format AAAAMMJJ0000
|
||||
donnees_administration_ruf1: char, // CN
|
||||
donnees_administration_ruf2: String, // CA - 24
|
||||
donnees_ruf_administration: String, // CE - 10
|
||||
type_d_identification_du_porteur: char, // CA
|
||||
numero_national_d_immatriculation: String, // CA - 13
|
||||
cle_du_nir: String, // CA - 2
|
||||
code_regime: String, // CN - 2
|
||||
caisse_gestionnaire: String, // CN - 3
|
||||
centre_gestionnaire: String, // CN - 4
|
||||
code_gestion: String, // CA - 2
|
||||
donnees_ruf_famille: String, // CE - 55
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct ServiceAMOFamille {
|
||||
code_service_amo_famille: String, // CN - 2
|
||||
date_de_debut_service_amo_famille: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_service_amo_famille: String, // CN - Format AAAAMMJJ0000
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesAccidentTravail {
|
||||
organisme_gestionnaire_risque_at: String, // CN - 9
|
||||
code_at: char, // CA - 2
|
||||
identifiant_at: String, // CN - 9
|
||||
organisme_gestionnaire_at1: String, // CN - 9
|
||||
code_at1: char, // CA - 2
|
||||
identifiant_at1: String, // CN - 9
|
||||
organisme_gestionnaire_at2: String, // CN - 9
|
||||
code_at2: char, // CA - 2
|
||||
identifiant_at2: String, // CN - 9
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesBeneficiaire {
|
||||
nom_usuel: String, // CE - 27
|
||||
nom_de_famille: String, // CE - 27
|
||||
prenom: String, // CE - 27
|
||||
adresse_ligne_1: String, // CE - 32
|
||||
adresse_ligne_2: String, // CE - 32
|
||||
adresse_ligne_3: String, // CE - 32
|
||||
adresse_ligne_4: String, // CE - 32
|
||||
adresse_ligne_5: String, // CE - 32
|
||||
nir_certifie: String, // CA - 13
|
||||
cle_du_nir_certifie: String, // CN - 2
|
||||
date_de_certification_du_nir: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_naissance: String, // CN - Format AAAAMMJJ0000
|
||||
rang_de_naissance: String, // CN - 1
|
||||
qualite: String, // CN - 2
|
||||
code_service_amo_beneficiaire: char, // CA - 2
|
||||
date_de_debut_service_amo: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_service_amo: String, // CN - Format AAAAMMJJ0000
|
||||
donnees_ruf_amo: String, // CE - 30
|
||||
periodeDroitsAMO: Vec<PeriodeDroitsAMO>,
|
||||
periodeCodeCouverture: Vec<PeriodeCodeCouverture>,
|
||||
donneesMutuelle: DonneesMutuelle,
|
||||
donneesComplementaire: DonneesComplementaire,
|
||||
donneesRUFBeneficiaireComplementaire: DonneesRUFBeneficiaireComplementaire,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct PeriodeDroitsAMO {
|
||||
date_de_debut_droits_amo: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_droits_amo: String, // CN - Format AAAAMMJJ0000
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct PeriodeCodeCouverture {
|
||||
date_de_debut_code_couverture: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_code_couverture: String, // CN - Format AAAAMMJJ0000
|
||||
code_ald: String, // CN - 1
|
||||
code_situation: String, // CN - 4
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesMutuelle {
|
||||
identification_mutuelle: String, // CN - 8
|
||||
garanties_effectives: String, // CA - 8
|
||||
indicateur_de_traitement_mutuelle: String, // CN - 2
|
||||
type_de_services_associes: char, // CA - 1
|
||||
services_associes_au_contrat: String, // CA - 17
|
||||
code_aiguillage_sts: char, // CA - 1
|
||||
periodeDroitsMutuelle: Vec<PeriodeDroitsMutuelle>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct PeriodeDroitsMutuelle {
|
||||
date_de_debut_droits_mutuelle: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_droits_mutuelle: String, // CN - Format AAAAMMJJ0000
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesComplementaire {
|
||||
numero_complementaire_b2: String, // CA - 10
|
||||
numero_complementaire_edi: String, // CA - 19
|
||||
numero_adherent_amc: String, // CA - 8
|
||||
indicateur_de_traitement_amc: String, // CN - 2
|
||||
date_de_debut_validite_amc: String, // CN - Format AAAAMMJJ0000
|
||||
date_de_fin_validite_amc: String, // CN - Format AAAAMMJJ0000
|
||||
code_routage_flux_amc: String, // CA - 2
|
||||
identifiant_hote: String, // CA - 3
|
||||
nom_de_domaine_amc: String, // CE - 20
|
||||
code_aiguillage_sts: char, // CA - 1
|
||||
type_de_services_associes: char, // CA - 1
|
||||
services_associes_au_contrat: String, // CE - 17
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct DonneesRUFBeneficiaireComplementaire {
|
||||
donnees_ruf_beneficiaire_complementaire: String, // CE - 115
|
||||
}
|
||||
|
||||
pub fn LireDroitsVitale(
|
||||
lecteurPS: &str,
|
||||
lecteurVitale: &str,
|
||||
codePorteurPS: &str,
|
||||
dateConsultation: &str,
|
||||
) -> Result<CarteVitale, String> {
|
||||
let resource_ps = CString::new(lecteurPS).expect("CString::new failed");
|
||||
let resource_vitale = CString::new(lecteurVitale).expect("CString::new failed");
|
||||
let card_number = CString::new(codePorteurPS).expect("CString::new failed");
|
||||
let date_consultation = CString::new(dateConsultation).expect("CString::new failed");
|
||||
|
||||
let mut buffer: *mut c_void = ptr::null_mut();
|
||||
let mut size: size_t = 0;
|
||||
let mut hex_values: &[u8] = &[];
|
||||
unsafe {
|
||||
let result = SSV_LireDroitsVitale(
|
||||
resource_ps.as_ptr(),
|
||||
resource_vitale.as_ptr(),
|
||||
card_number.as_ptr(),
|
||||
date_consultation.as_ptr(),
|
||||
&mut buffer,
|
||||
&mut size,
|
||||
);
|
||||
println!("SSV_LireDroitsVitale result: {}", result);
|
||||
|
||||
if !buffer.is_null() {
|
||||
hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
|
||||
}
|
||||
}
|
||||
|
||||
let groups = decode_ssv_memory(hex_values, hex_values.len());
|
||||
|
||||
let OUT = decode_carte_vitale(groups);
|
||||
|
||||
unsafe {
|
||||
if !buffer.is_null() {
|
||||
libc::free(buffer); // ??? si liberer avant decode_ssv_memory et decode_carte_vitale alors hex_values n'est plus correct ???
|
||||
}
|
||||
}
|
||||
OUT
|
||||
|
||||
}
|
||||
|
||||
fn decode_carte_vitale(groups: Vec<Block>) -> Result<CarteVitale, String> {
|
||||
let mut cartevitale = CarteVitale::default();
|
||||
|
||||
for group in groups {
|
||||
for field in group.content {
|
||||
match (group.id, field.id) {
|
||||
(104, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.push(DonneesBeneficiaire::default());
|
||||
}
|
||||
(105, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeDroitsAMO
|
||||
.push(PeriodeDroitsAMO::default());
|
||||
}
|
||||
(106, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.push(PeriodeCodeCouverture::default());
|
||||
}
|
||||
(108, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.periodeDroitsMutuelle
|
||||
.push(PeriodeDroitsMutuelle::default());
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
if field.content.len() > 0 {
|
||||
match (group.id, field.id) {
|
||||
(101, 1) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAssure.type_de_carte_vitale = byte as char;
|
||||
}
|
||||
(101, 2) => {
|
||||
cartevitale.donneesAssure.numero_de_serie = //bytes_to_decimal_string(&field.content);
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 3) => {
|
||||
cartevitale.donneesAssure.date_de_fin_de_validite =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 4) => {
|
||||
println!("101.4 field.size: {:#?}", field.size);
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAssure.donnees_administration_ruf1 = byte as char;
|
||||
}
|
||||
(101, 5) => {
|
||||
cartevitale.donneesAssure.donnees_administration_ruf2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 6) => {
|
||||
cartevitale.donneesAssure.donnees_ruf_administration =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 7) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAssure.type_d_identification_du_porteur = byte as char;
|
||||
}
|
||||
(101, 8) => {
|
||||
cartevitale.donneesAssure.numero_national_d_immatriculation =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 9) => {
|
||||
cartevitale.donneesAssure.cle_du_nir =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 10) => {
|
||||
cartevitale.donneesAssure.code_regime =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 11) => {
|
||||
cartevitale.donneesAssure.caisse_gestionnaire =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 12) => {
|
||||
cartevitale.donneesAssure.centre_gestionnaire =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 13) => {
|
||||
cartevitale.donneesAssure.code_gestion =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(101, 14) => {
|
||||
cartevitale.donneesAssure.donnees_ruf_famille =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(102, 1) => {
|
||||
cartevitale.serviceAMOFamille.code_service_amo_famille =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(102, 2) => {
|
||||
cartevitale
|
||||
.serviceAMOFamille
|
||||
.date_de_debut_service_amo_famille =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(102, 3) => {
|
||||
cartevitale
|
||||
.serviceAMOFamille
|
||||
.date_de_fin_service_amo_famille =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 1) => {
|
||||
cartevitale
|
||||
.donneesAccidentTravail
|
||||
.organisme_gestionnaire_risque_at =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 2) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAccidentTravail.code_at = byte as char;
|
||||
}
|
||||
(103, 3) => {
|
||||
cartevitale.donneesAccidentTravail.identifiant_at =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 4) => {
|
||||
cartevitale
|
||||
.donneesAccidentTravail
|
||||
.organisme_gestionnaire_at1 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 5) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAccidentTravail.code_at1 = byte as char;
|
||||
}
|
||||
(103, 6) => {
|
||||
cartevitale.donneesAccidentTravail.identifiant_at1 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 7) => {
|
||||
cartevitale
|
||||
.donneesAccidentTravail
|
||||
.organisme_gestionnaire_at2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(103, 8) => {
|
||||
let byte = field.content[0];
|
||||
cartevitale.donneesAccidentTravail.code_at2 = byte as char;
|
||||
}
|
||||
(103, 9) => {
|
||||
cartevitale.donneesAccidentTravail.identifiant_at2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.nom_usuel = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.nom_de_famille = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 3) => {
|
||||
cartevitale.donneesBeneficiaire.last_mut().unwrap().prenom =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 4) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_1 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 5) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_2 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 6) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_3 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 7) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_4 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 8) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.adresse_ligne_5 = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 9) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.nir_certifie = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 10) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.cle_du_nir_certifie =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 11) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_certification_du_nir =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 12) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_naissance = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 13) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.rang_de_naissance = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 14) => {
|
||||
cartevitale.donneesBeneficiaire.last_mut().unwrap().qualite =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 15) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.code_service_amo_beneficiaire = field.content[0] as char;
|
||||
}
|
||||
(104, 16) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_debut_service_amo =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 17) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_fin_service_amo =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(104, 18) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donnees_ruf_amo = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(105, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeDroitsAMO
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_debut_droits_amo =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(105, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeDroitsAMO
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_fin_droits_amo =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(106, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_debut_code_couverture =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(106, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_fin_code_couverture =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(106, 3) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.code_ald = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(106, 4) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.periodeCodeCouverture
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.code_situation = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.identification_mutuelle =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.garanties_effectives =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 3) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.indicateur_de_traitement_mutuelle =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 4) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.type_de_services_associes = field.content[0] as char;
|
||||
}
|
||||
(107, 5) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.services_associes_au_contrat =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(107, 6) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.code_aiguillage_sts = field.content[0] as char;
|
||||
}
|
||||
(108, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.periodeDroitsMutuelle
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_debut_droits_mutuelle =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(108, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesMutuelle
|
||||
.periodeDroitsMutuelle
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.date_de_fin_droits_mutuelle =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.numero_complementaire_b2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 2) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.numero_complementaire_edi =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 3) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.numero_adherent_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 4) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.indicateur_de_traitement_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 5) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.date_de_debut_validite_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 6) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.date_de_fin_validite_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 7) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.code_routage_flux_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 8) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.identifiant_hote = String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 9) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.nom_de_domaine_amc =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(109, 10) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.code_aiguillage_sts = field.content[0] as char;
|
||||
}
|
||||
(109, 11) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.type_de_services_associes = field.content[0] as char;
|
||||
}
|
||||
(109, 12) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesComplementaire
|
||||
.services_associes_au_contrat =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(111, 1) => {
|
||||
cartevitale
|
||||
.donneesBeneficiaire
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.donneesRUFBeneficiaireComplementaire
|
||||
.donnees_ruf_beneficiaire_complementaire =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
_ => {
|
||||
return Err(format!(
|
||||
"Unknown (group, field) pair: ({}, {})",
|
||||
group.id, field.id
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(cartevitale)
|
||||
}
|
||||
|
||||
// #[cfg(test)]
|
||||
// mod test_decode_carte_ps {
|
||||
// use super::*;
|
||||
|
||||
// #[test]
|
||||
// fn test_francoise_pharmacien0052419() {
|
||||
// let bytes: &[u8] = &[
|
||||
// 0, 1, 51, // Block 01, Content size 51
|
||||
// 1, 48, // Field 01, Content size 1
|
||||
// 1, 56, // Field 02, Content size 1
|
||||
// 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // Field 03, Content size 11
|
||||
// 1, 52, // Field 04, Content size 1
|
||||
// 2, 50, 50, // Field 05, Content size 2
|
||||
// 17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49,
|
||||
// 57, // Field 06, Content size 17
|
||||
// 9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // Field 07, Content size 9
|
||||
// 1, 84, // Field 08, Content size 1
|
||||
// 0, 2, 83, // Block 02, Content size 83
|
||||
// 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
||||
// 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
|
||||
// 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
||||
// 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
||||
// ];
|
||||
// let blocks = decode_ssv_memory(bytes, bytes.len());
|
||||
// let carte_ps = decode_carte_ps(blocks).unwrap();
|
||||
|
||||
// assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
|
||||
// assert_eq!(carte_ps.titulaire.type_d_identification_nationale, "8");
|
||||
// assert_eq!(
|
||||
// carte_ps.titulaire.numero_d_identification_nationale,
|
||||
// "99700524194"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.titulaire.cle_du_numero_d_identification_nationale,
|
||||
// "4"
|
||||
// );
|
||||
// assert_eq!(carte_ps.titulaire.code_civilite, "22");
|
||||
// assert_eq!(carte_ps.titulaire.nom_du_ps, "PHARMACIEN0052419");
|
||||
// assert_eq!(carte_ps.titulaire.prenom_du_ps, "FRANCOISE");
|
||||
// assert_eq!(carte_ps.titulaire.categorie_carte, 'T');
|
||||
|
||||
// assert_eq!(carte_ps.situations.len(), 1);
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].numero_logique_de_la_situation_de_facturation_du_ps,
|
||||
// 1
|
||||
// );
|
||||
// assert_eq!(carte_ps.situations[0].mode_d_exercice, "0");
|
||||
// assert_eq!(carte_ps.situations[0].statut_d_exercice, "1");
|
||||
// assert_eq!(carte_ps.situations[0].secteur_d_activite, "86");
|
||||
// assert_eq!(carte_ps.situations[0].type_d_identification_structure, "1");
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].numero_d_identification_structure,
|
||||
// "0B0221958"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].cle_du_numero_d_identification_structure,
|
||||
// "8"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].raison_sociale_structure,
|
||||
// "PHARMACIE DU CENTRE22195"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].numero_d_identification_de_facturation_du_ps,
|
||||
// "00202419"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].cle_du_numero_d_identification_de_facturation_du_ps,
|
||||
// "8"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].numero_d_identification_du_ps_remplaçant,
|
||||
// ""
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].cle_du_numero_d_identification_du_ps_remplaçant,
|
||||
// "0"
|
||||
// );
|
||||
// assert_eq!(carte_ps.situations[0].code_conventionnel, "1");
|
||||
// assert_eq!(carte_ps.situations[0].code_specialite, "50");
|
||||
// assert_eq!(carte_ps.situations[0].code_zone_tarifaire, "10");
|
||||
// assert_eq!(carte_ps.situations[0].code_zone_ik, "00");
|
||||
// assert_eq!(carte_ps.situations[0].code_agrement_1, "0");
|
||||
// assert_eq!(carte_ps.situations[0].code_agrement_2, "0");
|
||||
// assert_eq!(carte_ps.situations[0].code_agrement_3, "0");
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].habilitation_à_signer_une_facture,
|
||||
// "1"
|
||||
// );
|
||||
// assert_eq!(carte_ps.situations[0].habilitation_à_signer_un_lot, "1");
|
||||
// }
|
||||
|
||||
// #[test]
|
||||
// fn test_multiple_situations() {
|
||||
// let bytes: &[u8] = &[
|
||||
// 0, 1, 51, // Block 01, Content size 51
|
||||
// 1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 50, 17, 80,
|
||||
// 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78, 67,
|
||||
// 79, 73, 83, 69, 1, 84, 0, 2, 83, // Block 02, Content size 83
|
||||
// 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
||||
// 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
|
||||
// 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
||||
// 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 0, 3,
|
||||
// 83, // Block 03, Content size 83
|
||||
// 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
||||
// 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
|
||||
// 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
||||
// 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 0, 4,
|
||||
// 83, // Block 04, Content size 83
|
||||
// 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
||||
// 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
|
||||
// 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
||||
// 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
||||
// ];
|
||||
// let blocks = decode_ssv_memory(bytes, bytes.len());
|
||||
// let carte_ps = decode_carte_ps(blocks).unwrap();
|
||||
|
||||
// assert_eq!(carte_ps.situations.len(), 3);
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[0].raison_sociale_structure,
|
||||
// "PHARMACIE DU CENTRE22195"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[1].raison_sociale_structure,
|
||||
// "PHARMACIE DU CENTRE22195"
|
||||
// );
|
||||
// assert_eq!(
|
||||
// carte_ps.situations[2].raison_sociale_structure,
|
||||
// "PHARMACIE DU CENTRE22195"
|
||||
// );
|
||||
// }
|
||||
|
||||
// #[test]
|
||||
// #[should_panic]
|
||||
// fn test_missing_field() {
|
||||
// todo!();
|
||||
// }
|
||||
|
||||
// #[test]
|
||||
// #[should_panic]
|
||||
// fn test_unknown_group_field_pair() {
|
||||
// todo!();
|
||||
// }
|
||||
|
||||
// #[test]
|
||||
// #[should_panic]
|
||||
// fn test_invalid_field_format() {
|
||||
// todo!();
|
||||
// }
|
||||
// }
|
@ -1,24 +1,9 @@
|
||||
use libc::{c_void, size_t};
|
||||
use std::ffi::CString;
|
||||
use std::ptr;
|
||||
use thiserror::Error;
|
||||
|
||||
use crate::libssv::{self, SSV_LireCartePS};
|
||||
use crate::ssv_memory::{decode_ssv_memory, Block, SSVMemoryError};
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum CartePSError {
|
||||
#[error("Unknown (group, field) pair: ({group}, {field})")]
|
||||
UnknownGroupFieldPair { group: u16, field: u16 },
|
||||
#[error("CString creation error: {0}")]
|
||||
CString(#[from] std::ffi::NulError),
|
||||
#[error("Unable to get the last situation while parsing a CartePS")]
|
||||
InvalidLastSituation,
|
||||
#[error(transparent)]
|
||||
SSVMemory(#[from] SSVMemoryError),
|
||||
#[error(transparent)]
|
||||
SSVLibErrorCode(#[from] libssv::LibSSVError),
|
||||
}
|
||||
use crate::libssv::SSV_LireCartePS;
|
||||
use crate::ssv_memory::{decode_ssv_memory, Block};
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct CartePS {
|
||||
@ -67,10 +52,10 @@ struct SituationPS {
|
||||
habilitation_à_signer_un_lot: String,
|
||||
}
|
||||
|
||||
pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, CartePSError> {
|
||||
let resource_ps = CString::new(lecteur)?;
|
||||
let resource_reader = CString::new("")?;
|
||||
let card_number = CString::new(code_pin)?;
|
||||
pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, String> {
|
||||
let resource_ps = CString::new(lecteur).expect("CString::new failed");
|
||||
let resource_reader = CString::new("").expect("CString::new failed");
|
||||
let card_number = CString::new(code_pin).expect("CString::new failed");
|
||||
|
||||
let mut buffer: *mut c_void = ptr::null_mut();
|
||||
let mut size: size_t = 0;
|
||||
@ -84,32 +69,17 @@ pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, CartePSError
|
||||
&mut size,
|
||||
);
|
||||
println!("SSV_LireCartePS result: {}", result);
|
||||
if result != 0 {
|
||||
return Err(libssv::LibSSVError::StandardErrorCode {
|
||||
code: result,
|
||||
function: "SSV_LireCartePS",
|
||||
}
|
||||
.into());
|
||||
}
|
||||
|
||||
if !buffer.is_null() {
|
||||
hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
|
||||
libc::free(buffer);
|
||||
}
|
||||
}
|
||||
let groups =
|
||||
decode_ssv_memory(hex_values, hex_values.len()).map_err(CartePSError::SSVMemory)?;
|
||||
let groups = decode_ssv_memory(hex_values, hex_values.len());
|
||||
decode_carte_ps(groups)
|
||||
}
|
||||
|
||||
fn get_last_mut_situation(carte_ps: &mut CartePS) -> Result<&mut SituationPS, CartePSError> {
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.ok_or(CartePSError::InvalidLastSituation)
|
||||
}
|
||||
|
||||
fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, CartePSError> {
|
||||
fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, String> {
|
||||
let mut carte_ps = CartePS::default();
|
||||
for group in groups {
|
||||
for field in group.content {
|
||||
@ -148,99 +118,137 @@ fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, CartePSError> {
|
||||
}
|
||||
(2..=16, 1) => {
|
||||
carte_ps.situations.push(SituationPS::default());
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.numero_logique_de_la_situation_de_facturation_du_ps = field.content[0];
|
||||
}
|
||||
(2..=16, 2) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.mode_d_exercice =
|
||||
carte_ps.situations.last_mut().unwrap().mode_d_exercice =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 3) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.statut_d_exercice =
|
||||
carte_ps.situations.last_mut().unwrap().statut_d_exercice =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 4) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.secteur_d_activite =
|
||||
carte_ps.situations.last_mut().unwrap().secteur_d_activite =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 5) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.type_d_identification_structure =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.type_d_identification_structure =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 6) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.numero_d_identification_structure =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.numero_d_identification_structure =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 7) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.cle_du_numero_d_identification_structure =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 8) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.raison_sociale_structure =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.raison_sociale_structure =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 9) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.numero_d_identification_de_facturation_du_ps =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 10) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.cle_du_numero_d_identification_de_facturation_du_ps =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 11) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.numero_d_identification_du_ps_remplaçant =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 12) => {
|
||||
get_last_mut_situation(&mut carte_ps)?
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.cle_du_numero_d_identification_du_ps_remplaçant =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 13) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_conventionnel =
|
||||
carte_ps.situations.last_mut().unwrap().code_conventionnel =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 14) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_specialite =
|
||||
carte_ps.situations.last_mut().unwrap().code_specialite =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 15) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_zone_tarifaire =
|
||||
carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 16) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_zone_ik =
|
||||
carte_ps.situations.last_mut().unwrap().code_zone_ik =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 17) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_agrement_1 =
|
||||
carte_ps.situations.last_mut().unwrap().code_agrement_1 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 18) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_agrement_2 =
|
||||
carte_ps.situations.last_mut().unwrap().code_agrement_2 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 19) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.code_agrement_3 =
|
||||
carte_ps.situations.last_mut().unwrap().code_agrement_3 =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 20) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_une_facture =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.habilitation_à_signer_une_facture =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
(2..=16, 21) => {
|
||||
get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_un_lot =
|
||||
carte_ps
|
||||
.situations
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.habilitation_à_signer_un_lot =
|
||||
String::from_utf8_lossy(field.content).to_string();
|
||||
}
|
||||
_ => {
|
||||
return Err(CartePSError::UnknownGroupFieldPair {
|
||||
group: group.id,
|
||||
field: field.id,
|
||||
});
|
||||
return Err(format!(
|
||||
"Unknown (group, field) pair: ({}, {})",
|
||||
group.id, field.id
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -271,7 +279,7 @@ mod test_decode_carte_ps {
|
||||
57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
||||
48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
||||
];
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
||||
let carte_ps = decode_carte_ps(blocks).unwrap();
|
||||
|
||||
assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
|
||||
@ -362,7 +370,7 @@ mod test_decode_carte_ps {
|
||||
57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
||||
48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
||||
];
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
||||
let carte_ps = decode_carte_ps(blocks).unwrap();
|
||||
|
||||
assert_eq!(carte_ps.situations.len(), 3);
|
||||
|
@ -1,4 +1,5 @@
|
||||
pub mod cps;
|
||||
pub mod cartevitale;
|
||||
pub mod libssv;
|
||||
pub mod ssv_memory;
|
||||
pub mod ssvlib_demo;
|
||||
|
@ -3,13 +3,6 @@
|
||||
/// Low level bindings to the SSVLIB dynamic library.
|
||||
// TODO : look for creating a dedicated *-sys crate : https://kornel.ski/rust-sys-crate
|
||||
use libc::{c_char, c_ushort, c_void, size_t};
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum LibSSVError {
|
||||
#[error("SSV library error in {function}: {code}")]
|
||||
StandardErrorCode { code: u16, function: &'static str },
|
||||
}
|
||||
|
||||
#[cfg_attr(target_os = "linux", link(name = "ssvlux64"))]
|
||||
#[cfg_attr(target_os = "windows", link(name = "ssvw64"))]
|
||||
@ -26,5 +19,13 @@ extern "C" {
|
||||
ZDonneesSortie: *mut *mut c_void,
|
||||
TTailleDonneesSortie: *mut size_t,
|
||||
) -> c_ushort;
|
||||
pub fn SSV_LireDroitsVitale(
|
||||
NomRessourcePS: *const c_char,
|
||||
NomRessourceLecteur: *const c_char,
|
||||
CodePorteurPS: *const c_char,
|
||||
DateConsultation: *const c_char,
|
||||
ZDonneesSortie: *mut *mut c_void,
|
||||
TTailleDonneesSortie: *mut size_t,
|
||||
) -> c_ushort;
|
||||
}
|
||||
// TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs
|
||||
|
@ -1,10 +1,9 @@
|
||||
mod cps;
|
||||
mod cartevitale;
|
||||
mod libssv;
|
||||
mod ssv_memory;
|
||||
mod ssvlib_demo;
|
||||
|
||||
use anyhow::{Context, Result};
|
||||
|
||||
fn main() -> Result<()> {
|
||||
ssvlib_demo::demo().context("Error while running the SSV library demo")
|
||||
fn main() {
|
||||
ssvlib_demo::demo();
|
||||
}
|
||||
|
@ -1,33 +1,6 @@
|
||||
/// # SSV Memory
|
||||
/// Provide functions to manipulate raw memory from SSV library.
|
||||
use std::convert::TryFrom;
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum BytesReadingError {
|
||||
#[error("Empty bytes input")]
|
||||
EmptyBytes,
|
||||
#[error("Invalid memory: not enough bytes ({actual}) to read the expected size ({expected})")]
|
||||
InvalidSize { expected: usize, actual: usize },
|
||||
#[error("Invalid memory: size ({actual}) is expected to be less than {expected} bytes")]
|
||||
SizeTooBig { expected: usize, actual: usize },
|
||||
#[error("Invalid memory: not enough bytes to read the block id")]
|
||||
InvalidBlockId(#[from] std::array::TryFromSliceError),
|
||||
#[error("Error while reading field at offset {offset}")]
|
||||
InvalidField {
|
||||
source: Box<BytesReadingError>,
|
||||
offset: usize,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum SSVMemoryError {
|
||||
#[error("Error while parsing block at offset {offset}")]
|
||||
BlockParsing {
|
||||
source: BytesReadingError,
|
||||
offset: usize,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Debug)]
|
||||
struct ElementSize {
|
||||
@ -36,12 +9,13 @@ struct ElementSize {
|
||||
}
|
||||
|
||||
// TODO : Est-ce qu'on pourrait/devrait définir un type custom pour représenter les tableaux de bytes ?
|
||||
|
||||
impl TryFrom<&[u8]> for ElementSize {
|
||||
type Error = BytesReadingError;
|
||||
type Error = &'static str;
|
||||
|
||||
fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
|
||||
if bytes.is_empty() {
|
||||
return Err(BytesReadingError::EmptyBytes);
|
||||
return Err("Empty bytes input");
|
||||
}
|
||||
|
||||
let mut element_size = ElementSize { size: 0, pad: 1 };
|
||||
@ -56,15 +30,9 @@ impl TryFrom<&[u8]> for ElementSize {
|
||||
// N are the 7 lower bits of the first byte
|
||||
let size_bytes_len = (bytes[0] & 0b0111_1111) as usize;
|
||||
if size_bytes_len > bytes.len() - 1 {
|
||||
return Err(BytesReadingError::InvalidSize {
|
||||
expected: size_bytes_len,
|
||||
actual: bytes.len() - 1,
|
||||
});
|
||||
return Err("Invalid memory: not enough bytes to read the size");
|
||||
} else if size_bytes_len > 4 {
|
||||
return Err(BytesReadingError::SizeTooBig {
|
||||
expected: 4,
|
||||
actual: size_bytes_len,
|
||||
});
|
||||
return Err("Invalid memory: size is too big");
|
||||
}
|
||||
let size_bytes = &bytes[1..1 + size_bytes_len];
|
||||
|
||||
@ -86,21 +54,15 @@ pub struct Block<'a> {
|
||||
pub content: Vec<Field<'a>>,
|
||||
}
|
||||
|
||||
impl<'a> TryFrom<&'a [u8]> for Block<'a> {
|
||||
type Error = BytesReadingError;
|
||||
|
||||
fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
|
||||
impl<'a> From<&'a [u8]> for Block<'a> {
|
||||
fn from(bytes: &'a [u8]) -> Self {
|
||||
let mut offset = 0;
|
||||
let id = u16::from_be_bytes(
|
||||
bytes[..2]
|
||||
.try_into()
|
||||
.map_err(BytesReadingError::InvalidBlockId)?,
|
||||
);
|
||||
let id = u16::from_be_bytes(bytes[..2].try_into().unwrap());
|
||||
offset += 2;
|
||||
let ElementSize {
|
||||
size: block_size,
|
||||
pad,
|
||||
} = bytes[2..].try_into()?;
|
||||
} = bytes[2..].try_into().unwrap();
|
||||
offset += pad;
|
||||
let raw_content = &bytes[offset..];
|
||||
let mut field_offset = 0;
|
||||
@ -108,22 +70,19 @@ impl<'a> TryFrom<&'a [u8]> for Block<'a> {
|
||||
let mut content = Vec::new();
|
||||
let mut field_id = 1;
|
||||
while field_offset < block_size {
|
||||
let mut field: Field<'a> = raw_content[field_offset..].try_into().map_err(|err| {
|
||||
BytesReadingError::InvalidField {
|
||||
source: Box::new(err),
|
||||
offset: field_offset,
|
||||
}
|
||||
})?;
|
||||
let mut field: Field<'a> = raw_content[field_offset..].into();
|
||||
|
||||
|
||||
field.id = field_id;
|
||||
field_offset += field.size;
|
||||
field_id += 1;
|
||||
content.push(field);
|
||||
}
|
||||
Ok(Block {
|
||||
Block {
|
||||
id,
|
||||
size: offset + block_size,
|
||||
content,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -134,41 +93,31 @@ pub struct Field<'a> {
|
||||
pub content: &'a [u8],
|
||||
}
|
||||
|
||||
impl<'a> TryFrom<&'a [u8]> for Field<'a> {
|
||||
type Error = BytesReadingError;
|
||||
|
||||
fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
|
||||
let ElementSize { size, pad } = bytes.try_into()?;
|
||||
impl<'a> From<&'a [u8]> for Field<'a> {
|
||||
fn from(bytes: &'a [u8]) -> Self {
|
||||
let ElementSize { size, pad } = bytes.try_into().unwrap();
|
||||
let contenu = &bytes[pad..pad + size];
|
||||
Ok(Field {
|
||||
Field {
|
||||
id: 0,
|
||||
size: pad + size,
|
||||
content: contenu,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Result<Vec<Block>, SSVMemoryError> {
|
||||
pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Vec<Block> {
|
||||
let mut blocks: Vec<Block> = Vec::new();
|
||||
let mut offset = 0;
|
||||
while offset < size {
|
||||
let block: Block =
|
||||
bytes[offset..]
|
||||
.try_into()
|
||||
.map_err(|err| SSVMemoryError::BlockParsing {
|
||||
source: err,
|
||||
offset,
|
||||
})?;
|
||||
let block: Block = bytes[offset..].into();
|
||||
offset += block.size;
|
||||
blocks.push(block);
|
||||
}
|
||||
Ok(blocks)
|
||||
blocks
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test_element_size {
|
||||
use std::any::Any;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
@ -195,51 +144,29 @@ mod test_element_size {
|
||||
#[test]
|
||||
fn null_size() {
|
||||
let bytes: &[u8] = &[];
|
||||
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||
assert!(result.is_err());
|
||||
assert_eq!(
|
||||
result.unwrap_err().type_id(),
|
||||
BytesReadingError::EmptyBytes.type_id()
|
||||
);
|
||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
||||
assert_eq!(result, Err("Empty bytes input"),);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn invalid_memory() {
|
||||
let bytes: &[u8] = &[0b_1000_0001_u8];
|
||||
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||
assert!(result.is_err());
|
||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
||||
assert_eq!(
|
||||
result.unwrap_err().to_string(),
|
||||
BytesReadingError::InvalidSize {
|
||||
expected: 1,
|
||||
actual: 0
|
||||
}
|
||||
.to_string()
|
||||
result,
|
||||
Err("Invalid memory: not enough bytes to read the size"),
|
||||
);
|
||||
|
||||
let bytes: &[u8] = &[0b_1000_0010_u8, 1];
|
||||
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||
assert!(result.is_err());
|
||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
||||
assert_eq!(
|
||||
result.unwrap_err().to_string(),
|
||||
BytesReadingError::InvalidSize {
|
||||
expected: 2,
|
||||
actual: 1
|
||||
}
|
||||
.to_string()
|
||||
result,
|
||||
Err("Invalid memory: not enough bytes to read the size"),
|
||||
);
|
||||
|
||||
let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
|
||||
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||
assert!(result.is_err());
|
||||
assert_eq!(
|
||||
result.unwrap_err().to_string(),
|
||||
BytesReadingError::SizeTooBig {
|
||||
expected: 4,
|
||||
actual: 5
|
||||
}
|
||||
.to_string()
|
||||
);
|
||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
||||
assert_eq!(result, Err("Invalid memory: size is too big"),);
|
||||
}
|
||||
}
|
||||
|
||||
@ -254,7 +181,7 @@ mod test_field {
|
||||
80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78,
|
||||
67, 79, 73, 83, 69, 1, 84,
|
||||
];
|
||||
let element: Field = bytes.try_into().unwrap();
|
||||
let element: Field = bytes.into();
|
||||
assert_eq!(element.size, 52);
|
||||
assert_eq!(element.content[..5], [1, 48, 1, 56, 11]);
|
||||
}
|
||||
@ -269,7 +196,7 @@ mod test_field {
|
||||
// Add 256 bytes to the content
|
||||
bytes_vec.append(&mut vec![1; 256]);
|
||||
let bytes: &[u8] = &bytes_vec;
|
||||
let element: Field = bytes.try_into().unwrap();
|
||||
let element: Field = bytes.into();
|
||||
assert_eq!(element.size, 259);
|
||||
assert_eq!(element.content.len(), 256);
|
||||
}
|
||||
@ -283,15 +210,15 @@ mod test_block {
|
||||
fn test_francoise_pharmacien0052419_partial_block_1() {
|
||||
let bytes: &[u8] = &[1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52];
|
||||
|
||||
let field1: Field = bytes.try_into().unwrap();
|
||||
let field1: Field = bytes.into();
|
||||
assert_eq!(field1.size, 2);
|
||||
assert_eq!(field1.content, &[48]);
|
||||
|
||||
let field2: Field = bytes[field1.size..].try_into().unwrap();
|
||||
let field2: Field = bytes[field1.size..].into();
|
||||
assert_eq!(field2.size, 2);
|
||||
assert_eq!(field2.content, &[56]);
|
||||
|
||||
let field3: Field = bytes[field1.size + field2.size..].try_into().unwrap();
|
||||
let field3: Field = bytes[field1.size + field2.size..].into();
|
||||
assert_eq!(field3.size, 12);
|
||||
assert_eq!(
|
||||
field3.content,
|
||||
@ -318,12 +245,12 @@ mod test_block {
|
||||
48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
||||
];
|
||||
|
||||
let first_block: Block = bytes.try_into().unwrap();
|
||||
let first_block: Block = bytes.into();
|
||||
assert_eq!(first_block.id, 1);
|
||||
assert_eq!(first_block.size, 54);
|
||||
assert_eq!(first_block.content.len(), 8);
|
||||
|
||||
let second_block: Block = bytes[first_block.size..].try_into().unwrap();
|
||||
let second_block: Block = bytes[first_block.size..].into();
|
||||
assert_eq!(second_block.id, 2);
|
||||
assert_eq!(second_block.size, 86);
|
||||
assert_eq!(second_block.content.len(), 21);
|
||||
@ -352,7 +279,7 @@ mod test_decode_ssv_memory {
|
||||
50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
|
||||
48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
||||
];
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
|
||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
||||
assert_eq!(blocks.len(), 2);
|
||||
}
|
||||
}
|
||||
|
@ -1,56 +1,33 @@
|
||||
/// High level API for the SSV library,
|
||||
/// based on the low level bindings in libssv.rs.
|
||||
extern crate dotenv;
|
||||
use libc::{c_void, size_t};
|
||||
use std::env;
|
||||
use std::ffi::CString;
|
||||
use std::path::PathBuf;
|
||||
use std::ptr;
|
||||
use thiserror::Error;
|
||||
|
||||
|
||||
use crate::cps::lire_carte;
|
||||
use crate::cartevitale::LireDroitsVitale;
|
||||
|
||||
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
|
||||
|
||||
use ::utils::config::{load_config, ConfigError};
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum SSVDemoError {
|
||||
#[error(transparent)]
|
||||
CartePSReading(#[from] crate::cps::CartePSError),
|
||||
#[error(transparent)]
|
||||
SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
|
||||
#[error(transparent)]
|
||||
Configuration(#[from] ConfigError),
|
||||
}
|
||||
|
||||
fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
|
||||
fn ssv_init_lib_2() {
|
||||
let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
|
||||
let ini = CString::new(ini_str).expect("CString::new failed");
|
||||
unsafe {
|
||||
let result = SSV_InitLIB2(ini.as_ptr());
|
||||
println!("SSV_InitLIB2 result: {}", result);
|
||||
if result != 0 {
|
||||
return Err(crate::libssv::LibSSVError::StandardErrorCode {
|
||||
code: result,
|
||||
function: "SSV_InitLIB2",
|
||||
}
|
||||
.into());
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn ssv_lire_config() -> Result<(), SSVDemoError> {
|
||||
fn ssv_lire_config() {
|
||||
let mut buffer: *mut c_void = ptr::null_mut();
|
||||
let mut size: size_t = 0;
|
||||
unsafe {
|
||||
let result = SSV_LireConfig(&mut buffer, &mut size);
|
||||
println!("SSV_LireConfig result: {}", result);
|
||||
if result != 0 {
|
||||
return Err(crate::libssv::LibSSVError::StandardErrorCode {
|
||||
code: result,
|
||||
function: "SSV_LireConfig",
|
||||
}
|
||||
.into());
|
||||
}
|
||||
|
||||
if !buffer.is_null() {
|
||||
let hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
|
||||
@ -62,26 +39,30 @@ fn ssv_lire_config() -> Result<(), SSVDemoError> {
|
||||
libc::free(buffer);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn demo() -> Result<(), SSVDemoError> {
|
||||
pub fn demo() {
|
||||
// TODO : this is probably not working on release, because I'm not sure it exists a CARGO_MANIFEST_DIR and so it can find the `.env`
|
||||
// Maybe we could use a system standard config path to store a config file
|
||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
||||
let manifest_path = PathBuf::from(manifest_dir);
|
||||
dotenv::from_path(manifest_path.join(".env")).ok();
|
||||
|
||||
println!("------- Demo for the SSV library --------");
|
||||
|
||||
load_config(None)?;
|
||||
|
||||
ssv_init_lib_2()?;
|
||||
ssv_init_lib_2();
|
||||
|
||||
let code_pin = "1234";
|
||||
let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0";
|
||||
let carte_ps = lire_carte(code_pin, lecteur)?;
|
||||
let lecteurvitale = "HID Global OMNIKEY 3x21 Smart Card Reader 1";
|
||||
let dateconsultation ="20240813";
|
||||
let carte_ps = lire_carte(code_pin, lecteur).unwrap();
|
||||
println!("CartePS: {:#?}", carte_ps);
|
||||
|
||||
ssv_lire_config()?;
|
||||
ssv_lire_config();
|
||||
|
||||
let carte_vitale = LireDroitsVitale(lecteur, lecteurvitale, code_pin, dateconsultation).unwrap();
|
||||
println!("carte_vitale: {:#?}", carte_vitale);
|
||||
|
||||
println!("-----------------------------------------");
|
||||
Ok(())
|
||||
}
|
||||
|
@ -3,3 +3,4 @@ EXPORTS
|
||||
SSV_InitLIB2
|
||||
SSV_LireCartePS
|
||||
SSV_LireConfig
|
||||
SSV_LireDroitsVitale
|
@ -1,10 +0,0 @@
|
||||
[package]
|
||||
name = "utils"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow.workspace = true
|
||||
directories = "5.0"
|
||||
dotenv.workspace = true
|
||||
thiserror.workspace = true
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user